diff --git a/.gitignore b/.gitignore
index 53d05fa2e228e01a74c7c4850feae609fb55f9f1..55a1eae6236460ecf592c3a01492f7588f7d8444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,12 @@ langfiles.zip
 /public/js/lib.js
 /public/js/scriptStartPage.js
 /public/js/scriptResultPage.js
+/public/js/focus-creator.js
 /public/js/searchbar.js
 /public/js/utility.js
 /public/css/beitritt.css
 /public/css/themes/default.css
 /public/css/utility.css
-/public/js/utility.js
 
 **/*.map
 /.buildpath
diff --git a/public/js/focus-creator.js b/public/js/focus-creator.js
deleted file mode 100644
index dfeaa708c0e1bb288c95bef5f81e4bea3669818d..0000000000000000000000000000000000000000
--- a/public/js/focus-creator.js
+++ /dev/null
@@ -1,433 +0,0 @@
-$(function () {
-  setFocusCreatorActionListeners();
-  loadInitialCustomFocuses();
-  loadInitialSelectedFocus();
-  focusChanged();
-});
-
-/**
- * Sets all action listeners for this page
- */
-function setFocusCreatorActionListeners () {
-  $('.focusCheckbox').click(checkboxCheckListener);
-  $('#addFocusBtn').click(() => showFocusCreateDialog(''));
-  $('#editFocusBtn').click(editCurrentFocus);
-  $('.save-focus-btn').click(saveFocus);
-  $('.delete-focus-btn').click(deleteFocus);
-  $('#focus-select').change(focusChanged);
-  // Save Focus on clicking enter while in the focus name input
-  $('#focus-name').keyup(function (event) {
-    if (event.keyCode == 13) {
-      saveFocus();
-    }
-  });
-  $('#create-focus-modal').on('shown.bs.modal', function () {
-    $('#focus-name').focus();
-  });
-}
-/**
- * Loads all the custom focuses stored in local storage
- */
-function loadInitialCustomFocuses () {
-  for (var key in localStorage) {
-    if (key.startsWith('focus_')) {
-      var focus = loadFocusById(key);
-      addFocus(focus.name);
-    }
-  }
-}
-
-function loadInitialSelectedFocus () {
-  setFocus(getFocusInUrl());
-}
-
-/**
- * Shows the focus create dialog
- * If an id is given it will try to load a focus for the given id
- */
-function showFocusCreateDialog (id) {
-  if (id === undefined) {
-    id = '';
-  }
-  document.getElementById('original-id').value = id;
-  $('#create-focus-modal').modal('show');
-  var storedFocus = loadFocusById(id);
-  var focus = {};
-  // Try to load a focus for the given id
-  $('#focus-name').val('');
-  uncheckAll();
-  if (storedFocus !== null) {
-    try {
-      focus = JSON.parse(localStorage.getItem(id));
-      $('#focus-name').val(focus.name);
-      for (var key in focus) {
-        if (key.startsWith('engine_')) {
-          $('.focusCheckbox[name=' + key + ']').prop('checked', true);
-        }
-      }
-    } catch (ex) {
-      console.error(ex);
-    }
-  }
-  toggleDeleteButton();
-}
-
-/**
- * Shows the focus create dialog for a given id
- */
-function showFocusEditDialog (id) {
-  showFocusCreateDialog(id);
-}
-
-function getCurrentFocus () {
-  return $('#foki > div.active').attr('id');
-}
-
-/**
- * Shows an edit dialog for the current selected focus
- */
-function editCurrentFocus () {
-  var currentFocus = getCurrentFocus();
-  if (currentFocus !== undefined) {
-    showFocusEditDialog(currentFocus);
-  }
-}
-
-/**
- * Shows/Hides the delete button if (no) checkboxes are selected
- */
-function toggleDeleteButton () {
-  if (atLeastOneChecked()) {
-    $('.delete-focus-btn').show();
-  } else {
-    $('.delete-focus-btn').hide();
-  }
-}
-
-/**
- * Save the current Focus
- * Listens for save button
- */
-function saveFocus () {
-  /* Vorprüfungen */
-  // Falls keine Suchmaschine ausgewählt wurde
-  if (!atLeastOneChecked()) {
-    switch (document.documentElement.lang) {
-      case 'en':
-        alert('Please select at least 1 search engine.');
-        break;
-      case 'es':
-        alert('Por favor, seleccione al menos un motor de búsqueda.');
-        break;
-      default:
-        alert('Bitte mindestens 1 Suchmaschine auswählen.');
-        break;
-    }
-    return;
-  }
-  // Falls der Name zu kurz ist oder ungültige Zeichen enthält
-  var name = document.getElementById('focus-name').value;
-  if (!isValidName(name)) {
-    switch (document.documentElement.lang) {
-      case 'en':
-        alert('No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character');
-        break;
-      case 'es':
-        alert('Por favor, introduzca un nombre válido');
-        break;
-      default:
-        alert('Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n');
-        break;
-    }
-    return;
-  }
-  // Liest die original-id des aktuellen fokus-dialogs (gesetzt wenn man einen Fokus bearbeitet)
-  var oldId = document.getElementById('original-id').value;
-  var id = getIdFromName(name);
-  var overwrite = true;
-  // Wenn bereits ein Fokus mit dem Namen existiert, man diesen aber nicht editiert sondern gerade einen Neuen erstellt
-  if (alreadyInUse(name) && oldId !== id) {
-    // Fragt den Nutzer ob er den Fokus überschreiben möchte
-    if (!confirm('Name bereits genutzt\nüberschreiben?')) {
-      // Falls nicht wird das Speichern abgebrochen
-      return;
-    }
-    // Ansonsten wird der andere Fokus gelöscht
-    deleteFocusById(id);
-  }
-  /* Fokus speichern */
-  var focus = {};
-  // Ausgewählte Suchmaschinen lesen und zu Fokus hinzufügen
-  $('input[type=checkbox]:checked').each(function (el) {
-    focus[$(this).attr('name')] = $(this).val();
-  });
-
-  // Name setzen
-  focus['name'] = name;
-  // Alte Version des Fokus löschen (aus localStorage und von der Webseite, falls eine existiert)
-  if (oldId !== '') {
-    localStorage.removeItem(oldId);
-    removeFocusById(oldId);
-  }
-  // Neue Version des Fokus hinzufügen (zu localStorage und der Webseite)
-  localStorage.setItem(id, JSON.stringify(focus));
-  addFocus(name);
-  setFocus(id);
-  // Fokus-Formular verbergen
-  $('#create-focus-modal').modal('hide');
-}
-
-/**
- * Delete current Focus
- * Listens for delete button
- */
-function deleteFocusById (id) {
-  localStorage.removeItem(id);
-  removeFocusById(id);
-  $('#focus-select').change();
-}
-
-/**
- * Delete current Focus
- * Listens for delete button
- */
-function deleteFocus () {
-  var oldId = document.getElementById('original-id').value;
-  deleteFocusById(oldId);
-  $('#create-focus-modal').modal('hide');
-  $('#focus-select').change();
-}
-
-/**
- * Is the name valid (in terms of characters)?
- */
-function isValidName (name) {
-  // no Characters other then a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed
-  // at least 1 character
-  return /^[a-zA-Z0-9äöüß\-_ ]+$/.test(name);
-}
-
-/**
- * Is at least one focus selected?
- */
-function atLeastOneChecked () {
-  return $('.focusCheckbox:checked').length > 0;
-}
-
-/**
- * Is there already a focus with this name?
- */
-function alreadyInUse (name) {
-  return localStorage.hasOwnProperty(getIdFromName(name));
-}
-
-/**
- * Adds an option to the focus selector
- */
-function addFocus (name) {
-  var id = getIdFromName(name);
-  var customFocus = $('<div id="' + id + '"><a href="#" target="_self">' + name + '</a><a class="edit-focus" data-id="' + id + '" href="#"><i class="fa fa-wrench"></i></div>');
-  $(customFocus).find('.edit-focus').click(function () {
-    showFocusEditDialog($(this).attr('data-id'));
-  });
-  $('#foki .search-option-frame').before(customFocus);
-}
-
-/**
- * Remove the focuses html-elements
- */
-function removeFocus (name) {
-  removeFocusById(getIdFromName(name));
-}
-
-/**
- * Remove the focuses html-elements
- */
-function removeFocusById (id) {
-  if (id == '') {
-    return;
-  }
-  $('#focus-select option[value="' + id + '"]').remove();
-}
-
-/**
- * Turns a name into an id
- * Converts special characters and spaces
- */
-function getIdFromName (name) {
-  name = name.toLowerCase();
-  name = name.split(' ').join('_');
-  name = name.split('ä').join('ae');
-  name = name.split('ö').join('oe');
-  name = name.split('ü').join('ue');
-  return 'focus_' + name;
-}
-
-/**
- * Loads the focus object for the given id from local storage
- */
-function loadFocusById (id) {
-  return JSON.parse(localStorage.getItem(id));
-}
-
-/**
- * Unchecks all focuses from the focus creator dialog
- */
-function uncheckAll () {
-  $('.focusCheckbox').prop('checked', false);
-}
-
-/**
- * Sets the selected focus to default
- */
-function setFocusToDefault () {
-  setFocus(DEFAULT_FOCUS);
-}
-
-/**
- * Sets the selected focus
- * @param {String} focusID The id of the focus, without #
- */
-function setFocus (focusID) {
-  $('#focus-select option[value="' + focusID + '"]').prop('selected', true);
-  $('#focus-select').change();
-}
-
-function focusChanged () {
-  var selectedFocus = getCurrentFocus();
-  if (typeof(currentFocus) !== 'undefined') {
-    if (focusIsEditable(selectedFocus)) {
-      enableEditFocusBtn();
-    } else {
-      disableEditFocusBtn();
-    }
-    loadFocusForSearch(selectedFocus);
-  }
-}
-
-function focusIsEditable (focus) {
-  if (focus.startsWith('focus_')) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function enableEditFocusBtn () {
-  $('#editFocusBtn').removeClass('disabled').click(editCurrentFocus);
-}
-
-function disableEditFocusBtn () {
-  $('#editFocusBtn').addClass('disabled').off('click');
-}
-
-function loadFocusForSearch (focus) {
-  var focus = loadFocusById(focus);
-
-  var url = '/meta/meta.ger3?eingabe=x&focus=';
-
-  // clearCustomSearch()
-  for (var key in focus) {
-    if (key.startsWith('engine_') && focus[key] == 'on') {
-      addSumaToCustomSearch(key);
-    }
-  }
-}
-
-function getFocusInUrl () {
-  var url = window.location;
-  var focReg = /focus=(focus_\w+)/.exec(url);
-  if (focReg && focReg[1]) {
-    return focReg[1];
-  }
-}
-
-function checkboxCheckListener (event) {
-  toggleDeleteButton();
-  var elem = event.target;
-  if (elem.name) {
-    if (elem.checked) {
-      setCheckedForAllWithName(elem.name, true);
-    } else {
-      setCheckedForAllWithName(elem.name, false);
-    }
-  }
-}
-
-function setCheckedForAllWithName (name, checked) {
-  $('.focusCheckbox[name=' + name + ']').prop('checked', checked);
-}
-
-/**
- * Ãœbersetzt den Key in die aktuelle Sprache.
- * Die Sprache kann optional auch explizit angegeben werden.
- * Verwendung: t('KEY')
- */
-
-// Speichert die Ãœbersetzungen
-var translations = {
-  'de': {
-    'select-engine': 'Bitte mindestens 1 Suchmaschine auswählen.',
-    'select-valid-name': 'Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n',
-    'confirm-overwrite-name': 'Name bereits genutzt.\nÃœberschreiben?',
-    'saved-settings': 'Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.',
-    'generated-plugin': 'Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.',
-    'result-saver.title': 'Gespeicherte Ergebnisse',
-    'result-saver.filter': 'Filtern',
-    'result-saver.sort.chronological': 'Chronologisch',
-    'result-saver.sort.ranking': 'MetaGer-Ranking',
-    'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
-    'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
-    'result-saver.deleteAll': '<span class="hidden-xs">Ergebnisse</span> löschen</button>',
-    'result-saver.save.this': 'ÖFFNEN',
-    'result-saver.save.newtab': 'IN NEUEM TAB',
-    'result-saver.save.anonymous': 'ANONYM ÖFFNEN'
-  },
-
-  'en': {
-    'select-engine': 'Please select at least 1 search engine.',
-    'select-valid-name': 'No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character',
-    'confirm-overwrite-name': 'Name already in use.\nOverwrite?',
-    'saved-settings': 'On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.',
-    'generated-plugin': 'Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.',
-    'result-saver.title': 'Saved Results',
-    'result-saver.filter': 'Filter',
-    'result-saver.sort.chronological': 'Chronological',
-    'result-saver.sort.ranking': 'MetaGer-Ranking',
-    'result-saver.sort.alphabetical': 'Alphabetical (Hostname)',
-    'result-saver.delete': 'Delete saved Result',
-    'result-saver.deleteAll': 'delete <span class="hidden-xs">results</span>',
-    'result-saver.save.this': 'OPEN',
-    'result-saver.save.newtab': 'IN NEW TAB',
-    'result-saver.save.anonymous': 'OPEN ANONYMOUSLY'
-  },
-
-  'es': {
-    'select-engine': 'Por favor, seleccione al menos un motor de búsqueda.',
-    'select-valid-name': 'Por favor, introduzca un nombre válido constituido por letras y números.',
-    'confirm-overwrite-name': 'Nombre ya ha sido elegido.\n¿Substituirlo?',
-  // 'saved-settings': '',
-  // 'generated-plugin': ''
-  // 'result-saver.sort.chronological': 'Chronologisch',
-  // 'result-saver.sort.ranking': 'MetaGer-Ranking',
-  // 'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
-  // 'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
-  }
-};
-
-/**
- * Übersetzt den gegebenen Schlüssel in der gegebenen Sprache
- * Gibt standardmäßig deutsche Sprachstrings zurück, da davon ausgegangen werden kann, dass diese immer vorhanden sind
- * @param {string} key Zu übersetzender Schlüssel
- * @param {string} lang Zu verwendende Sprache
- */
-function t (key, lang) {
-  if (arguments.length == 1) {
-    var lang = $('html').attr('lang');
-    return translations[lang][key];
-  } else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
-    return translations[lang][key];
-  } else {
-    return translations.de[key];
-  }
-}
diff --git a/public/js/searchbar.js b/public/js/searchbar.js
deleted file mode 100644
index b268478e09718537a7b7f4062cf0a11dd02dac11..0000000000000000000000000000000000000000
--- a/public/js/searchbar.js
+++ /dev/null
@@ -1,112 +0,0 @@
-$(function () {
-  loadLocalStorage();
-});
-
-/**
- * Loads the user theme and stored settings from local storage
- */
-function loadLocalStorage () {
-  if (localStorage) {
-    setSettings();
-  }
-}
-
-function setSettings () {
-  var acceptedParams = ['autocomplete', 'key', 'lang', 'newtab', 'sprueche'];
-  for (var key in localStorage) {
-    var value = localStorage.getItem(key);
-    var accepted = false;
-    for (var i in acceptedParams) {
-      if (key === 'param_' + acceptedParams[i]) {
-        accepted = true;
-      }
-    }
-    if (accepted) {
-      key = key.substring(6);
-      // Check for existing hidden fields for this key
-      var existing = $('.search-hidden input[name="' + key + '"]');
-      if (existing.length === 0) {
-        // if none exist, create a new one
-        $('.search-hidden').append('<input type="hidden" name="' + key + '" value="' + value + '">');
-      }
-    }
-  }
-  // Change the request method to the given parameter
-  var requestMethod = localStorage.getItem('request');
-  if (requestMethod !== null && (requestMethod === 'GET' || requestMethod === 'POST')) {
-    $('#searchForm').attr('method', requestMethod);
-  }
-}
-/**
- * Ãœbersetzt den Key in die aktuelle Sprache.
- * Die Sprache kann optional auch explizit angegeben werden.
- * Verwendung: t('KEY')
- */
-
-// Speichert die Ãœbersetzungen
-var translations = {
-  'de': {
-    'select-engine': 'Bitte mindestens 1 Suchmaschine auswählen.',
-    'select-valid-name': 'Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n',
-    'confirm-overwrite-name': 'Name bereits genutzt.\nÃœberschreiben?',
-    'saved-settings': 'Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.',
-    'generated-plugin': 'Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.',
-    'result-saver.title': 'Gespeicherte Ergebnisse',
-    'result-saver.filter': 'Filtern',
-    'result-saver.sort.chronological': 'Chronologisch',
-    'result-saver.sort.ranking': 'MetaGer-Ranking',
-    'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
-    'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
-    'result-saver.deleteAll': '<span class="hidden-xs">Ergebnisse</span> löschen</button>',
-    'result-saver.save.this': 'ÖFFNEN',
-    'result-saver.save.newtab': 'IN NEUEM TAB',
-    'result-saver.save.anonymous': 'ANONYM ÖFFNEN'
-  },
-
-  'en': {
-    'select-engine': 'Please select at least 1 search engine.',
-    'select-valid-name': 'No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character',
-    'confirm-overwrite-name': 'Name already in use.\nOverwrite?',
-    'saved-settings': 'On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.',
-    'generated-plugin': 'Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.',
-    'result-saver.title': 'Saved Results',
-    'result-saver.filter': 'Filter',
-    'result-saver.sort.chronological': 'Chronological',
-    'result-saver.sort.ranking': 'MetaGer-Ranking',
-    'result-saver.sort.alphabetical': 'Alphabetical (Hostname)',
-    'result-saver.delete': 'Delete saved Result',
-    'result-saver.deleteAll': 'delete <span class="hidden-xs">results</span>',
-    'result-saver.save.this': 'OPEN',
-    'result-saver.save.newtab': 'IN NEW TAB',
-    'result-saver.save.anonymous': 'OPEN ANONYMOUSLY'
-  },
-
-  'es': {
-    'select-engine': 'Por favor, seleccione al menos un motor de búsqueda.',
-    'select-valid-name': 'Por favor, introduzca un nombre válido constituido por letras y números.',
-    'confirm-overwrite-name': 'Nombre ya ha sido elegido.\n¿Substituirlo?',
-  // 'saved-settings': '',
-  // 'generated-plugin': ''
-  // 'result-saver.sort.chronological': 'Chronologisch',
-  // 'result-saver.sort.ranking': 'MetaGer-Ranking',
-  // 'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
-  // 'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
-  }
-};
-
-/**
- * Übersetzt den gegebenen Schlüssel in der gegebenen Sprache
- * Gibt standardmäßig deutsche Sprachstrings zurück, da davon ausgegangen werden kann, dass diese immer vorhanden sind
- * @param {string} key Zu übersetzender Schlüssel
- * @param {string} lang Zu verwendende Sprache
- */
-function t (key, lang) {
-  if (arguments.length == 1) {
-    var lang = $('html').attr('lang');
-    return translations[lang][key];
-  } else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
-    return translations[lang][key];
-  } else {
-    return translations.de[key];
-  }
-}