diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index 6cdbc288529128c494647322c30223266025b3ad..0000000000000000000000000000000000000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-comment: false
-coverage:
-  status:
-    project:
-      default:
-        # basic
-        target: auto
-        threshold: null
-        base: auto 
-        # advanced
-        branches: null
-        if_no_uploads: error
-        if_not_found: success
-        if_ci_failed: error
-        only_pulls: false
-        flags: null
-        paths: null
-    patch:
-      default:
-        # basic
-        target: auto
-        threshold: null
-        base: auto 
-        # advanced
-        branches: null
-        if_no_uploads: error
-        if_not_found: success
-        if_ci_failed: error
-        only_pulls: false
-        flags: null
-        paths: null
diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 4f50efc408d1609e21d8790233d8909e88ce0e63..0000000000000000000000000000000000000000
--- a/.coveragerc
+++ /dev/null
@@ -1,20 +0,0 @@
-[run]
-branch = True
-source =
-  searx/engines
-  searx/__init__.py
-  searx/autocomplete.py
-  searx/https_rewrite.py
-  searx/languages.py
-  searx/search.py
-  searx/testing.py
-  searx/utils.py
-  searx/webapp.py
-
-[report]
-show_missing = True
-exclude_lines =
-    if __name__ == .__main__.:
-
-[html]
-directory = coverage
diff --git a/.gitignore b/.gitignore
index 3da4d038610eb046a60474484c08ccbd19507481..ad87b9922a056498bcf654d1e3080b233bf4c9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,11 @@ setup.cfg
 *~
 
 node_modules/
+yarn.lock
+yarn-error.log
 
 .tx/
+
+.vscode
+.idea
+dump.rdb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..051ef445e0e23f073dbc7b1adb3863a95d2d6b4f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,134 @@
+image: $CI_REGISTRY_IMAGE/env:latest
+
+stages:
+ - check
+ - build
+ - test
+ - report
+ - deploy
+
+python:
+  stage: check
+  before_script:
+    - ./manage.sh update_dev_packages
+  script:
+    - ./manage.sh pep8_check
+
+build:web:
+  stage: build
+  before_script:
+    - ./manage.sh npm_packages
+    - ./manage.sh update_dev_packages
+  script:
+    - ./manage.sh locales
+    - ./manage.sh styles
+    - ./manage.sh grunt_build
+
+
+
+.build:docker:
+  stage: build
+  image: docker:git
+  services:
+    - docker:18-dind
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE .
+    - docker push $CI_REGISTRY_IMAGE
+
+build:docker:master:
+  extends: .build:docker
+  only:
+    - master
+
+build:docker:tags:
+  extends: .build:docker
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  only:
+    - tags
+
+test:unit:
+  stage: test
+  before_script:
+    - ./manage.sh update_dev_packages
+  script:
+    - ./manage.sh unit_tests
+  artifacts:
+    paths:
+      - coverage
+    expire_in: 1 hour
+
+test:functional:
+  stage: test
+  image: docker:stable
+  services:
+    - docker:18-dind
+  variables:
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
+  before_script:
+    - docker run -id --rm -v $(pwd):/ws -e DOCKER_HOST=tcp://$(cat /etc/hosts | grep docker | cut -f1):2375/ -w /ws --name spotenv $CI_REGISTRY_IMAGE/env:latest sh
+    - docker exec -i spotenv ./manage.sh update_dev_packages
+  script:
+    - docker exec -i spotenv ./manage.sh functional_tests
+  artifacts:
+    paths:
+      - coverage
+    expire_in: 1 hour
+
+coverage:
+  stage: report
+  script:
+    - ./manage.sh coverage
+  dependencies:
+    - test:unit
+    - test:functional
+  coverage: '/TOTAL.*\s+(\d+%)$/'
+
+.deploy:template:
+  image: docker:stable
+  stage: deploy
+  only:
+    - branches
+  when: manual
+  dependencies: []
+  variables:
+    DEPLOY_FOLDER: /mnt/data
+  before_script:
+    - 'which ssh-agent || ( apk --update add openssh-client )'
+    - eval $(ssh-agent -s)
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - ssh -2 $PUBLISH_USER@$PUBLISH_URL "docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}"
+    - ssh -2 $PUBLISH_USER@$PUBLISH_URL "mkdir -p ${DEPLOY_FOLDER} && cd ${DEPLOY_FOLDER} && if [ ! -d ${CI_PROJECT_NAME} ] ; then git clone ${CI_PROJECT_URL}.git ; fi && cd ${CI_PROJECT_NAME} && git fetch && git checkout $CI_COMMIT_SHA"
+    - ssh -2 $PUBLISH_USER@$PUBLISH_URL "SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG && COMPOSE_FILE=$COMPOSE_FILE && SPOT_HOSTNAME=$SPOT_HOSTNAME && export SPOT_HOSTNAME COMPOSE_FILE SPOT_DOCKER_TAG && cd ${DEPLOY_FOLDER}/${CI_PROJECT_NAME} && docker-compose pull && docker-compose up -d --build --force-recreate"
+
+test:
+  extends: .deploy:template
+  variables:
+    PUBLISH_USER: root
+    PUBLISH_URL: spot.test.ecloud.global
+    GIT_STRATEGY: none
+    SPOT_HOSTNAME: spot.test.ecloud.global
+    SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_TEST}
+    COMPOSE_FILE: docker-compose.yml:docker-compose-dev.yml
+
+prod:
+  extends: .deploy:template
+  only:
+    - tags
+  variables:
+    PUBLISH_USER: root
+    PUBLISH_URL: spot.ecloud.global
+    GIT_STRATEGY: none
+    SPOT_HOSTNAME: spot.ecloud.global
+    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
+    SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_PROD}
+    COMPOSE_FILE: docker-compose.yml
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 674bfd758ae4782ae2a7a77ec30c42e0a6491146..cba6359e8fedf6f36ea4c496afbf5519498cb8a2 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,3 +1,5 @@
+Spot for /e/ (e.foundation) was forked from Searx https://github.com/asciimoo/searx
+
 Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament and Noémi Ványi.
 
 Major contributing authors:
@@ -98,3 +100,11 @@ generally made searx better:
 - @ZEROF
 - Ivan Skytte Jørgensen @isj-privacore
 - @miicha
+
+People who contributed to Spot:
+
+- Johnny Kalajdzic
+- Daniel Ramirez Martinez for e Foundation
+- Olivier Deckmyn
+- Omer Akram
+
diff --git a/Dockerfile b/Dockerfile
index 95e21813f6637170347b1008971cc5e63162606b..d71dc69a70b15075c5d4423d4d38c09a2f1e33b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,57 +1,26 @@
-FROM alpine:3.8
-LABEL maintainer="searx <https://github.com/asciimoo/searx>"
-LABEL description="A privacy-respecting, hackable metasearch engine."
-
-ENV BASE_URL=False IMAGE_PROXY=False HTTP_PROXY_URL= HTTPS_PROXY_URL=
-EXPOSE 8888
-WORKDIR /usr/local/searx
-CMD ["/sbin/tini","--","/usr/local/searx/run.sh"]
+FROM python:3.7-alpine as builder
 
-RUN adduser -D -h /usr/local/searx -s /bin/sh searx searx \
- && echo '#!/bin/sh' >> run.sh \
- && echo 'sed -i "s|base_url : False|base_url : $BASE_URL|g" searx/settings.yml' >> run.sh \
- && echo 'sed -i "s/image_proxy : False/image_proxy : $IMAGE_PROXY/g" searx/settings.yml' >> run.sh \
- && echo 'sed -i "s/ultrasecretkey/`openssl rand -hex 16`/g" searx/settings.yml' >> run.sh \
- && echo 'if [ -n "$HTTP_PROXY_URL" ] || [ -n "$HTTPS_PROXY_URL" ]; then' >> run.sh \
- && echo '  sed -i "s~^#    proxies :~    proxies:\\n      http: ${HTTP_PROXY_URL}\\n      https: ${HTTPS_PROXY_URL}\\n~" searx/settings.yml' >> run.sh \
- && echo 'fi' >> run.sh \
- && echo 'python searx/webapp.py' >> run.sh \
- && chmod +x run.sh
+RUN apk add \
+ git \
+ build-base \
+ libxml2-dev \
+ libxslt-dev
 
-COPY requirements.txt ./requirements.txt
+COPY . /src/
+RUN pip3 install --prefix /install /src
 
-RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
- && apk -U add \
-    build-base \
-    python \
-    python-dev \
-    py-pip \
-    libxml2 \
-    libxml2-dev \
-    libxslt \
-    libxslt-dev \
-    libffi-dev \
-    openssl \
-    openssl-dev \
-    ca-certificates \
-    tini@commuedge \
- && pip install --upgrade pip \
- && pip install --no-cache -r requirements.txt \
- && apk del \
-    build-base \
-    python-dev \
-    libffi-dev \
-    openssl-dev \
-    libxslt-dev \
-    libxml2-dev \
-    openssl-dev \
-    ca-certificates \
- && rm -f /var/cache/apk/*
 
-COPY . .
+FROM python:3.7-alpine
+LABEL maintainer="searx <https://github.com/asciimoo/searx>"
+LABEL description="A privacy-respecting, hackable metasearch engine."
 
-RUN chown -R searx:searx *
+RUN apk add \
+ ca-certificates \
+ libxslt \
+&& pip install coverage
 
-USER searx
+COPY --from=builder /install/ /usr/local/
 
-RUN sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml
+EXPOSE 8888
+STOPSIGNAL SIGINT
+CMD ["searx-run"]
diff --git a/Dockerfile.env b/Dockerfile.env
new file mode 100644
index 0000000000000000000000000000000000000000..964dcbc5cac97d1af766e9949cd4d22933ff90a3
--- /dev/null
+++ b/Dockerfile.env
@@ -0,0 +1,14 @@
+FROM fedora
+
+COPY requirements.txt requirements-dev.txt /
+
+RUN dnf install -y\
+ wget\
+ python2-pip\
+ npm\
+ docker \
+&& dnf groupinstall -y "Development Tools" \
+&& pip3 install ipdb ipython \
+&& pip3 install -r /requirements.txt \
+&& pip3 install -r /requirements-dev.txt \
+&& rm -f /requirements.txt /requirements-dev.txt
diff --git a/README.rst b/README.rst
index 35d14d1b4c6da0bf2b4326b2a783341531fe3611..f58430b4602d0f4aaf8b6c3c284667290baae038 100644
--- a/README.rst
+++ b/README.rst
@@ -1,33 +1,49 @@
-searx
-=====
+spot for /e/ (https://e.foundation)
+===================================
 
 A privacy-respecting, hackable `metasearch
 engine <https://en.wikipedia.org/wiki/Metasearch_engine>`__.
 
-Pronunciation: səːks
+Spot was forked from searx: read `documentation <https://asciimoo.github.io/searx>`__ and the `wiki <https://github.com/asciimoo/searx/wiki>`__ for more information.
 
-List of `running
-instances <https://github.com/asciimoo/searx/wiki/Searx-instances>`__.
+Spot is based on Python3.7+
 
-See the `documentation <https://asciimoo.github.io/searx>`__ and the `wiki <https://github.com/asciimoo/searx/wiki>`__ for more information.
+Getting Started
+~~~~~~~~~~~~
 
-|OpenCollective searx backers|
-|OpenCollective searx sponsors|
+You can run spot with docker-compose to run the **redis** database and
+the **spot** service. First of all you have to install **docker** and
+**docker-compose** on your host, then follow instructions below to run spot
+with one command.
 
-Installation
-~~~~~~~~~~~~
+- Run the docker-compose **up** command to start the project ``docker-compose up --build``
+- Getting the ip of the spot service and go to http://<spot-ip>:8888
 
--  clone source:
-   ``git clone https://github.com/asciimoo/searx.git && cd searx``
--  install dependencies: ``./manage.sh update_packages``
--  edit your
-   `settings.yml <https://github.com/asciimoo/searx/blob/master/searx/settings.yml>`__
-   (set your ``secret_key``!)
--  run ``python searx/webapp.py`` to start the application
+.. note::  Here the command to get the IP of the spot service
+ ``docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' my-spot_spot_1``
 
-For all the details, follow this `step by step
+You can also install **redis** and **spot** on your host, for all the details, follow this `step by step
 installation <https://github.com/asciimoo/searx/wiki/Installation>`__.
 
+Developer mode
+~~~~~~~~~~~~
+
+First run the redis database:
+
+- ``docker-compose up -d redis``
+
+Then on spot workdir run the following commands to start spot:
+
+- ``export COMPOSE_FILE=docker-compose.yml:docker-compose-dev.yml``
+- ``docker-compose build spot``
+- ``docker-compose run --rm -v $(pwd):/ws -w /ws -e PYTHONPATH=/ws spot sh``
+- ``python3 -X dev searx/webapp.py``
+
+Run tests:
+
+- ``docker run -it --rm -v $(pwd):/ws -w /ws -v /var/run/docker.sock:/var/run/docker.sock -e PYTHONPATH=/ws registry.gitlab.e.foundation:5000/e/cloud/my-spot/env bash``
+- ``COMPOSE_FILE=docker-compose.yml:docker-compose-dev.yml pytest --pdb --pdbcls IPython.terminal.debugger:TerminalPdb --dockerc-build -s tests/functional/``
+
 Bugs
 ~~~~
 
@@ -43,11 +59,3 @@ More about searx
 -  `openhub <https://www.openhub.net/p/searx/>`__
 -  `twitter <https://twitter.com/Searx_engine>`__
 -  IRC: #searx @ freenode
-
-
-.. |OpenCollective searx backers| image:: https://opencollective.com/searx/backers/badge.svg
-   :target: https://opencollective.com/searx#backer
-
-
-.. |OpenCollective searx sponsors| image:: https://opencollective.com/searx/sponsors/badge.svg
-   :target: https://opencollective.com/searx#sponsor
diff --git a/docker-compose-coverage.yml b/docker-compose-coverage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e0434e28be5f88c81a1dd486b5572572bc3b00c2
--- /dev/null
+++ b/docker-compose-coverage.yml
@@ -0,0 +1,19 @@
+version: '3.6'
+
+services:
+  spot:
+    build: .
+    entrypoint:
+      - coverage
+      - run
+      - --source=searx
+    command:
+      - /usr/local/bin/searx-run
+    volumes:
+      - coverage:/coverage
+    environment:
+      COVERAGE_FILE: /coverage/func
+
+volumes:
+  coverage:
+    name: spot-coverage
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
new file mode 100644
index 0000000000000000000000000000000000000000..139f5bf63efaa4689c17d8e1139c12f1511e070e
--- /dev/null
+++ b/docker-compose-dev.yml
@@ -0,0 +1,5 @@
+version: '3.6'
+
+services:
+  spot:
+    build: .
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..55dff8e74594bcf1b5ddd957a349e2029180d031
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '3.6'
+
+services:
+  redis:
+    restart: unless-stopped
+    image: redis:5-alpine
+
+  spot:
+    image: registry.gitlab.e.foundation:5000/e/cloud/my-spot:${SPOT_DOCKER_TAG:-latest}
+    restart: unless-stopped
+    environment:
+      SEARX_REDIS_HOST: redis
+      VIRTUAL_HOST: ${SPOT_HOSTNAME:-spot}
+      LETSENCRYPT_HOST: ${SPOT_HOSTNAME:-spot}
+      SEARX_LOGGER: INFO
+
+  proxy:
+    image: jwilder/nginx-proxy:alpine
+    restart: unless-stopped
+    container_name: proxy
+    volumes:
+      - ./etc/nginx/vhost.d/default:/etc/nginx/vhost.d/default
+      - /mnt/data/html:/usr/share/nginx/html
+      - /mnt/data/vhosts:/etc/nginx/vhost.d
+      - /mnt/data/certs:/etc/nginx/certs:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+
+  cert:
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    restart: unless-stopped
+    environment:
+      NGINX_PROXY_CONTAINER: proxy
+      DEFAULT_EMAIL: "contact@e.email"
+    volumes:
+      - /mnt/data/html:/usr/share/nginx/html
+      - /mnt/data/vhosts:/etc/nginx/vhost.d
+      - /mnt/data/certs:/etc/nginx/certs
+      - /var/run/docker.sock:/var/run/docker.sock:ro
diff --git a/etc/nginx/vhost.d/default b/etc/nginx/vhost.d/default
new file mode 100644
index 0000000000000000000000000000000000000000..07c6b072ba838626ff1a22c8d577fce5df416f7b
--- /dev/null
+++ b/etc/nginx/vhost.d/default
@@ -0,0 +1,5 @@
+add_header Content-Security-Policy "frame-ancestors 'self'";
+add_header Referrer-Policy "no-referrer, strict-origin-when-cross-origin";
+add_header X-Frame-Options "SAMEORIGIN";
+add_header X-XSS-Protection "1; mode=block";
+add_header X-Content-Type-Options "nosniff";
diff --git a/manage.sh b/manage.sh
index a352ccc6e5de14ca3e4e1dbe957cd4babdba4564..1d21b5886557e9c0a316fc109901662978091d63 100755
--- a/manage.sh
+++ b/manage.sh
@@ -8,6 +8,7 @@ set -e
 # subshell
 PYTHONPATH="$BASE_DIR"
 SEARX_DIR="$BASE_DIR/searx"
+COV_DIR="$BASE_DIR/coverage"
 ACTION="$1"
 
 
@@ -16,54 +17,14 @@ ACTION="$1"
 #
 
 update_packages() {
-    pip install --upgrade pip
-    pip install --upgrade setuptools
-    pip install -r "$BASE_DIR/requirements.txt"
+    pip3 install --upgrade pip
+    pip3 install --upgrade setuptools
+    pip3 install -r "$BASE_DIR/requirements.txt"
 }
 
 update_dev_packages() {
     update_packages
-    pip install -r "$BASE_DIR/requirements-dev.txt"
-}
-
-install_geckodriver() {
-    echo '[!] Checking geckodriver'
-    # TODO : check the current geckodriver version
-    set -e
-    geckodriver -V > /dev/null 2>&1 || NOTFOUND=1
-    set +e
-    if [ -z "$NOTFOUND" ]; then
-        return
-    fi
-    GECKODRIVER_VERSION="v0.19.1"
-    PLATFORM="`python -c "import six; import platform; six.print_(platform.system().lower(), platform.architecture()[0])"`"
-    case "$PLATFORM" in
-        "linux 32bit" | "linux2 32bit") ARCH="linux32";;
-        "linux 64bit" | "linux2 64bit") ARCH="linux64";;
-        "windows 32 bit") ARCH="win32";;
-        "windows 64 bit") ARCH="win64";;
-        "mac 64bit") ARCH="macos";;
-    esac
-    GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-$ARCH.tar.gz";
-
-    if [ -z "$1" ]; then
-        if [ -z "$VIRTUAL_ENV" ]; then
-            printf "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n  %s" "$GECKODRIVER_URL"
-            exit
-        else
-            GECKODRIVER_DIR="$VIRTUAL_ENV/bin"
-        fi
-    else
-        GECKODRIVER_DIR="$1"
-        mkdir -p -- "$GECKODRIVER_DIR"
-    fi
-
-    printf "Installing %s/geckodriver from\n  %s" "$GECKODRIVER_DIR" "$GECKODRIVER_URL"
-
-    FILE="`mktemp`"
-    wget -qO "$FILE" -- "$GECKODRIVER_URL" && tar xz -C "$GECKODRIVER_DIR" -f "$FILE" geckodriver
-    rm -- "$FILE"
-    chmod 777 -- "$GECKODRIVER_DIR/geckodriver"
+    pip3 install -r "$BASE_DIR/requirements-dev.txt"
 }
 
 locales() {
@@ -75,32 +36,40 @@ pep8_check() {
     # ignored rules:
     #  E402 module level import not at top of file
     #  W503 line break before binary operator
-    pep8 --exclude=searx/static --max-line-length=120 --ignore "E402,W503" "$SEARX_DIR" "$BASE_DIR/tests"
+    #  E722 do not use bare 'except'
+    pycodestyle --exclude=searx/static --max-line-length=120 --ignore "E402,W503,E722" "$SEARX_DIR" "$BASE_DIR/tests"
+    flake8 --ignore=E722 $SEARX_DIR/*.py
 }
 
 unit_tests() {
     echo '[!] Running unit tests'
-    python -m nose2 -s "$BASE_DIR/tests/unit"
+    mkdir -p "$COV_DIR"
+    chmod a+w "$COV_DIR"
+    PYTHONPATH="$BASE_DIR" COVERAGE_FILE="$COV_DIR"/unit pytest --cov=searx "$BASE_DIR/tests/unit"
 }
 
-py_test_coverage() {
-    echo '[!] Running python test coverage'
-    PYTHONPATH="`pwd`" python -m nose2 -C --log-capture --with-coverage --coverage "$SEARX_DIR" -s "$BASE_DIR/tests/unit" \
-    && coverage report \
-    && coverage html
+functional_tests() {
+    echo '[!] Running unit tests'
+    mkdir -p "$COV_DIR"
+    chmod a+w "$COV_DIR"
+    PYTHONPATH="$BASE_DIR" COMPOSE_FILE=docker-compose.yml:docker-compose-coverage.yml \
+        pytest "$BASE_DIR/tests/functional"
+    docker run -itd --rm --name tmp-vol -v spot-coverage:/coverage alpine
+    docker cp tmp-vol:/coverage/func $COV_DIR
+    docker stop tmp-vol
 }
 
-robot_tests() {
-    echo '[!] Running robot tests'
-    PYTHONPATH="`pwd`" python "$SEARX_DIR/testing.py" robot
+coverage() {
+    sed -i 's!/usr/local/lib/python3.7/site-packages/searx[^/]*/searx!'$SEARX_DIR'!g' "$COV_DIR"/func
+    coverage3 combine coverage/func coverage/unit
+    coverage3 report
 }
 
 tests() {
     set -e
     pep8_check
     unit_tests
-    install_geckodriver
-    robot_tests
+    functional_tests
     set +e
 }
 
@@ -110,7 +79,7 @@ tests() {
 #
 
 npm_path_setup() {
-    which npm || (printf 'Error: npm is not found\n'; exit 1)
+    which npm &>/dev/null || whereis npm &>/dev/null || (printf 'Error: npm is not found\n'; exit 1)
     export PATH="$(npm bin)":$PATH
 }
 
@@ -152,6 +121,7 @@ styles() {
 }
 
 grunt_build() {
+    npm_path_setup
     echo '[!] Grunt build : oscar theme'
     grunt --gruntfile "$SEARX_DIR/static/themes/oscar/gruntfile.js"
     echo '[!] Grunt build : simple theme'
@@ -174,7 +144,6 @@ Commands
     ------------------
     update_packages      - Check & update production dependency changes
     update_dev_packages  - Check & update development and production dependency changes
-    install_geckodriver  - Download & install geckodriver if not already installed (required for robot_tests)
     npm_packages         - Download & install npm dependencies (source manage.sh to update the PATH)
 
     Build
@@ -186,10 +155,9 @@ Commands
     Tests
     -----
     unit_tests           - Run unit tests
+    functional_tests     - Run functional tests
     pep8_check           - Pep8 validation
-    robot_tests          - Run selenium tests
-    tests                - Run all python tests (pep8, unit, robot_tests)
-    py_test_coverage     - Unit test coverage
+    tests                - Run all python tests (pep8, unit, functional)
 "
 }
 
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000000000000000000000000000000000..838879d3891422414879226e129b4c111a36d079
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = -s --dockerc-build --dockerc-attach-network --disable-pytest-warnings
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 077a9fa2a0bfbce78320a9178238b252674ffe68..695f9e18333ea12f236aba72309063e2f51b121b 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,11 +1,8 @@
 babel==2.3.4
 mock==2.0.0
-nose2[coverage-plugin]
-cov-core==1.15.0
-pep8==1.7.0
-plone.testing==5.0.0
-splinter==0.7.5
-transifex-client==0.12.2
-unittest2==1.1.0
-zope.testrunner==4.5.1
-selenium==3.5.0
+pycodestyle==2.5.0
+flake8==3.7.7
+mockredispy==2.9.3
+pytest==4.1.0
+pytest-cov==2.6.1
+pytest-dockerc==1.0.5
diff --git a/requirements.txt b/requirements.txt
index 94a7ccf045825a091d312a7012a394ee337cf073..353e045d3ebe693ec532ed8fb9d00898b2a589d7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,9 @@
-certifi==2019.3.9
-flask-babel==0.12.2
 flask==1.0.2
-idna==2.8
 jinja2==2.10.1
+flask-babel==0.12.2
 lxml==4.3.3
 pygments==2.1.3
-pyopenssl==19.0.0
 python-dateutil==2.8.0
 pyyaml==5.1
 requests[socks]==2.22.0
+redis==3.2.1
diff --git a/searx/__init__.py b/searx/__init__.py
index 4d7b2a8d3e0889a3b1f4faac7ffbe55b8dbcc16c..5bddf92189ecd0f1b7a2f70941ddda54408762b9 100644
--- a/searx/__init__.py
+++ b/searx/__init__.py
@@ -15,18 +15,11 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 (C) 2013- by Adam Tauber, <asciimoo@gmail.com>
 '''
 
-import certifi
 import logging
 from os import environ
 from os.path import realpath, dirname, join, abspath, isfile
-from io import open
-from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
-try:
-    from yaml import safe_load
-except:
-    from sys import exit, stderr
-    stderr.write('[E] install pyyaml\n')
-    exit(2)
+
+import yaml
 
 searx_dir = abspath(dirname(__file__))
 engine_dir = dirname(realpath(__file__))
@@ -38,6 +31,7 @@ def check_settings_yml(file_name):
     else:
         return None
 
+
 # find location of settings.yml
 if 'SEARX_SETTINGS_PATH' in environ:
     # if possible set path to settings using the
@@ -52,7 +46,11 @@ if not settings_path:
 
 # load settings
 with open(settings_path, 'r', encoding='utf-8') as settings_yaml:
-    settings = safe_load(settings_yaml)
+    # XXX: docker-compose does not support yet yaml >= 5
+    if int(yaml.__version__.split('.')[0]) >= 5:
+        settings = yaml.load(settings_yaml, Loader=yaml.FullLoader)
+    else:
+        settings = yaml.load(settings_yaml)
 
 '''
 enable debug if
@@ -65,29 +63,26 @@ the environnement variable SEARX_DEBUG is 0 or false
 (whatever the value in settings.yml)
 or general.debug=False in settings.yml
 '''
-searx_debug_env = environ.get('SEARX_DEBUG', '').lower()
-if searx_debug_env == 'true' or searx_debug_env == '1':
-    searx_debug = True
-elif searx_debug_env == 'false' or searx_debug_env == '0':
-    searx_debug = False
-else:
-    searx_debug = settings.get('general', {}).get('debug')
-
-if searx_debug:
-    logging.basicConfig(level=logging.DEBUG)
-else:
-    logging.basicConfig(level=logging.WARNING)
+searx_debug = True if settings.get('general', {}).get('debug') else False
+searx_loglevel = 'DEBUG' if searx_debug else 'WARNING'
+searx_loglevel = environ.get('SEARX_LOGGER', searx_loglevel).upper()
+logging.basicConfig(level=getattr(logging, searx_loglevel))
 
 logger = logging.getLogger('searx')
 logger.debug('read configuration from %s', settings_path)
-# Workaround for openssl versions <1.0.2
-# https://github.com/certifi/python-certifi/issues/26
-if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2):
-    if hasattr(certifi, 'old_where'):
-        environ['REQUESTS_CA_BUNDLE'] = certifi.old_where()
-    logger.warning('You are using an old openssl version({0}), please upgrade above 1.0.2!'.format(OPENSSL_VERSION))
 
 logger.info('Initialisation done')
 
 if 'SEARX_SECRET' in environ:
     settings['server']['secret_key'] = environ['SEARX_SECRET']
+if 'BASE_URL' in environ:
+    settings['server']['base_url'] = environ['BASE_URL']
+if 'IMAGE_PROXY' in environ:
+    settings['server']['image_proxy'] = environ['IMAGE_PROXY']
+if 'SEARX_REDIS_HOST' in environ:
+    settings['redis']['enable'] = True
+    settings['redis']['host'] = environ['SEARX_REDIS_HOST']
+if 'HTTP_PROXY_URL' in environ:
+    settings['proxies']['http'] = environ['HTTP_PROXY_URL']
+if 'HTTPS_PROXY_URL' in environ:
+    settings['proxies']['https'] = environ['HTTPS_PROXY_URL']
diff --git a/searx/answerers/__init__.py b/searx/answerers/__init__.py
index 444316f11dda8473611099a739ff62d198b699f9..447383acc4612768805d21b705a9ab7271e39093 100644
--- a/searx/answerers/__init__.py
+++ b/searx/answerers/__init__.py
@@ -1,12 +1,8 @@
 from os import listdir
 from os.path import realpath, dirname, join, isdir
-from sys import version_info
 from searx.utils import load_module
 from collections import defaultdict
 
-if version_info[0] == 3:
-    unicode = str
-
 
 answerers_dir = dirname(realpath(__file__))
 
@@ -34,12 +30,12 @@ def get_answerers_by_keywords(answerers):
 
 def ask(query):
     results = []
-    query_parts = list(filter(None, query.query.split()))
+    query_parts = list([_f for _f in query.query.split() if _f])
 
-    if query_parts[0].decode('utf-8') not in answerers_by_keywords:
+    if query_parts[0] not in answerers_by_keywords:
         return results
 
-    for answerer in answerers_by_keywords[query_parts[0].decode('utf-8')]:
+    for answerer in answerers_by_keywords[query_parts[0]]:
         result = answerer(query)
         if result:
             results.append(result)
diff --git a/searx/answerers/random/answerer.py b/searx/answerers/random/answerer.py
index b6e8422adb5eaf68522ab47bdc1d61ec45df76e6..7bfd5fa36df81dac3a2e2e95f2ba658f30a2728b 100644
--- a/searx/answerers/random/answerer.py
+++ b/searx/answerers/random/answerer.py
@@ -11,11 +11,7 @@ keywords = ('random',)
 
 random_int_max = 2**31
 
-if sys.version_info[0] == 2:
-    random_string_letters = string.lowercase + string.digits + string.uppercase
-else:
-    unicode = str
-    random_string_letters = string.ascii_lowercase + string.digits + string.ascii_uppercase
+random_string_letters = string.ascii_lowercase + string.digits + string.ascii_uppercase
 
 
 def random_characters():
@@ -24,32 +20,32 @@ def random_characters():
 
 
 def random_string():
-    return u''.join(random_characters())
+    return ''.join(random_characters())
 
 
 def random_float():
-    return unicode(random.random())
+    return str(random.random())
 
 
 def random_int():
-    return unicode(random.randint(-random_int_max, random_int_max))
+    return str(random.randint(-random_int_max, random_int_max))
 
 
 def random_sha256():
     m = hashlib.sha256()
-    m.update(b''.join(random_characters()))
-    return unicode(m.hexdigest())
+    m.update(''.join(random_characters()).encode())
+    return m.hexdigest()
 
 
 def random_uuid():
-    return unicode(uuid.uuid4())
+    return str(uuid.uuid4())
 
 
-random_types = {b'string': random_string,
-                b'int': random_int,
-                b'float': random_float,
-                b'sha256': random_sha256,
-                b'uuid': random_uuid}
+random_types = {'string': random_string,
+                'int': random_int,
+                'float': random_float,
+                'sha256': random_sha256,
+                'uuid': random_uuid}
 
 
 # required answerer function
@@ -70,4 +66,4 @@ def answer(query):
 def self_info():
     return {'name': gettext('Random value generator'),
             'description': gettext('Generate different random values'),
-            'examples': [u'random {}'.format(x) for x in random_types]}
+            'examples': ['random {}'.format(x) for x in random_types]}
diff --git a/searx/answerers/statistics/answerer.py b/searx/answerers/statistics/answerer.py
index 73dd25cfda36b150e8bb4abf94d8c1040fc35f59..d03a26af62d957f1a261bed64891148dbb8d3f47 100644
--- a/searx/answerers/statistics/answerer.py
+++ b/searx/answerers/statistics/answerer.py
@@ -1,12 +1,8 @@
-from sys import version_info
 from functools import reduce
 from operator import mul
 
 from flask_babel import gettext
 
-if version_info[0] == 3:
-    unicode = str
-
 keywords = ('min',
             'max',
             'avg',
@@ -30,21 +26,21 @@ def answer(query):
     func = parts[0]
     answer = None
 
-    if func == b'min':
+    if func == 'min':
         answer = min(args)
-    elif func == b'max':
+    elif func == 'max':
         answer = max(args)
-    elif func == b'avg':
+    elif func == 'avg':
         answer = sum(args) / len(args)
-    elif func == b'sum':
+    elif func == 'sum':
         answer = sum(args)
-    elif func == b'prod':
+    elif func == 'prod':
         answer = reduce(mul, args, 1)
 
     if answer is None:
         return []
 
-    return [{'answer': unicode(answer)}]
+    return [{'answer': answer}]
 
 
 # required answerer function
diff --git a/searx/autocomplete.py b/searx/autocomplete.py
index f8a45b3ecf86eda8166e4a1d81095af3454b322b..f9e493749edbf35a837b20fc980be7fda006ed3b 100644
--- a/searx/autocomplete.py
+++ b/searx/autocomplete.py
@@ -81,22 +81,22 @@ def searx_bang(full_query):
             engine_query = full_query.getSearchQuery()[1:]
 
             for lc in language_codes:
-                lang_id, lang_name, country, english_name = map(unicode.lower, lc)
+                lang_id, lang_name, country, english_name = map(str.lower, lc)
 
                 # check if query starts with language-id
                 if lang_id.startswith(engine_query):
                     if len(engine_query) <= 2:
-                        results.append(u':{lang_id}'.format(lang_id=lang_id.split('-')[0]))
+                        results.append(':{lang_id}'.format(lang_id=lang_id.split('-')[0]))
                     else:
-                        results.append(u':{lang_id}'.format(lang_id=lang_id))
+                        results.append(':{lang_id}'.format(lang_id=lang_id))
 
                 # check if query starts with language name
                 if lang_name.startswith(engine_query) or english_name.startswith(engine_query):
-                    results.append(u':{lang_name}'.format(lang_name=lang_name))
+                    results.append(':{lang_name}'.format(lang_name=lang_name))
 
                 # check if query starts with country
                 if country.startswith(engine_query.replace('_', ' ')):
-                    results.append(u':{country}'.format(country=country.replace(' ', '_')))
+                    results.append(':{country}'.format(country=country.replace(' ', '_')))
 
     # remove duplicates
     result_set = set(results)
@@ -130,9 +130,10 @@ def duckduckgo(query, lang):
     # duckduckgo autocompleter
     url = 'https://ac.duckduckgo.com/ac/?{0}&type=list'
 
-    resp = loads(get(url.format(urlencode(dict(q=query)))).text)
-    if len(resp) > 1:
-        return resp[1]
+    resp = get(url.format(urlencode(dict(q=query))))
+    if resp.status_code == 200 and resp.text:
+        res = loads(resp.text)
+        return res[1] if len(res) == 2 else []
     return []
 
 
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py
index f32b57202352f3ac9d3ac5df25080768a2c03452..953fa8bf0360fa19fc07ba459751d4663e707b39 100644
--- a/searx/engines/__init__.py
+++ b/searx/engines/__init__.py
@@ -18,12 +18,11 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 
 import sys
 import threading
-from os.path import realpath, dirname
-from io import open
+import json
+from pathlib import Path
 from babel.localedata import locale_identifiers
 from flask_babel import gettext
 from operator import itemgetter
-from json import loads
 from requests import get
 from searx import settings
 from searx import logger
@@ -32,13 +31,14 @@ from searx.utils import load_module, match_language
 
 logger = logger.getChild('engines')
 
-engine_dir = dirname(realpath(__file__))
+engine_dir = Path(__file__).parent
 
 engines = {}
 
 categories = {'general': []}
 
-languages = loads(open(engine_dir + '/../data/engines_languages.json', 'r', encoding='utf-8').read())
+with open(engine_dir.parent / "data" / "engines_languages.json", encoding='utf-8') as fd:
+    languages = json.load(fd)
 babel_langs = [lang_parts[0] + '-' + lang_parts[-1] if len(lang_parts) > 1 else lang_parts[0]
                for lang_parts in (lang_code.split('_') for lang_code in locale_identifiers())]
 
diff --git a/searx/engines/acgsou.py b/searx/engines/acgsou.py
index cca28f0db6a04b31180144f69a6e7967baf4c670..c82379c2735750f4654d785f9d942ec17c313f41 100644
--- a/searx/engines/acgsou.py
+++ b/searx/engines/acgsou.py
@@ -63,7 +63,7 @@ def response(resp):
         except:
             pass
         # I didn't add download/seed/leech count since as I figured out they are generated randomly everytime
-        content = u'Category: "{category}".'
+        content = 'Category: "{category}".'
         content = content.format(category=category)
 
         results.append({'url': href,
diff --git a/searx/engines/archlinux.py b/searx/engines/archlinux.py
index dce862f559a86fe735bc9a0e3356cef85cee07ea..46c4c0b7454b37ca3c7f6e2494d08a35a713df51 100644
--- a/searx/engines/archlinux.py
+++ b/searx/engines/archlinux.py
@@ -105,7 +105,7 @@ def request(query, params):
     # if our language is hosted on the main site, we need to add its name
     # to the query in order to narrow the results to that language
     if language in main_langs:
-        query += b' (' + main_langs[language] + b')'
+        query += ' (' + main_langs[language] + ')'
 
     # prepare the request parameters
     query = urlencode({'search': query})
diff --git a/searx/engines/arxiv.py b/searx/engines/arxiv.py
index 5ef84f0c1df2e26146d42855054024714fae83a7..84e844fbbcd5e8fd5a277a9a5185ceb17444bd89 100644
--- a/searx/engines/arxiv.py
+++ b/searx/engines/arxiv.py
@@ -61,7 +61,7 @@ def response(resp):
             content = content_string.format(doi_content="", abstract_content=abstract)
 
         if len(content) > 300:
-                    content = content[0:300] + "..."
+            content = content[0:300] + "..."
         # TODO: center snippet on query term
 
         publishedDate = datetime.strptime(entry.xpath('.//published')[0].text, '%Y-%m-%dT%H:%M:%SZ')
diff --git a/searx/engines/bing.py b/searx/engines/bing.py
index 742379c1a72818f1120e7c4be95d4f157cd8dbac..249febd6fc1b5978d12d7d9500a4c2c79ed01462 100644
--- a/searx/engines/bing.py
+++ b/searx/engines/bing.py
@@ -39,7 +39,7 @@ def request(query, params):
     else:
         lang = match_language(params['language'], supported_languages, language_aliases)
 
-    query = u'language:{} {}'.format(lang.split('-')[0].upper(), query.decode('utf-8')).encode('utf-8')
+    query = 'language:{} {}'.format(lang.split('-')[0].upper(), query)
 
     search_path = search_string.format(
         query=urlencode({'q': query}),
diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index e2495200c3a54e4fed1b7d2263b55b368b0b6ddf..d3f3d3ec2b62030a5bc7e970ddffb0707839b32c 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -116,7 +116,7 @@ def _fetch_supported_languages(resp):
 
     regions = dom.xpath(regions_xpath)
     for region in regions:
-        code = re.search('setmkt=[^\&]+', region).group()[7:]
+        code = re.search('setmkt=[^&]+', region).group()[7:]
         if code == 'nb-NO':
             code = 'no-NO'
 
diff --git a/searx/engines/bing_videos.py b/searx/engines/bing_videos.py
index bf17f91680f759390a096ab0803dfb9d00f6bf92..3665cf267547ec20044de44648f0c01f22012aae 100644
--- a/searx/engines/bing_videos.py
+++ b/searx/engines/bing_videos.py
@@ -1,18 +1,14 @@
 """
  Bing (Videos)
-
  @website     https://www.bing.com/videos
  @provide-api yes (http://datamarket.azure.com/dataset/bing/search)
-
  @using-api   no
  @results     HTML
  @stable      no
  @parse       url, title, content, thumbnail
 """
 
-from json import loads
 from lxml import html
-from searx.engines.bing_images import _fetch_supported_languages, supported_languages_url
 from searx.engines.xpath import extract_text
 from searx.url_utils import urlencode
 from searx.utils import match_language
@@ -48,7 +44,8 @@ def request(query, params):
         'ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
 
     # language cookie
-    language = match_language(params['language'], supported_languages, language_aliases).lower()
+    # NOTE: supported_languages initiated dynamically
+    language = match_language(params['language'], supported_languages).lower()
     params['cookies']['_EDGE_S'] = 'mkt=' + language + '&F=1'
 
     # query and paging
diff --git a/searx/engines/currency_convert.py b/searx/engines/currency_convert.py
index 8eab8f6736227879f0650fb406911f51a99252e6..2a2a3c35d80d60b8a9c28ab56a7f50529d4096c2 100644
--- a/searx/engines/currency_convert.py
+++ b/searx/engines/currency_convert.py
@@ -1,26 +1,23 @@
 import json
 import re
-import os
 import sys
 import unicodedata
 
-from io import open
+from pathlib import Path
 from datetime import datetime
 
-if sys.version_info[0] == 3:
-    unicode = str
 
 categories = []
 url = 'https://duckduckgo.com/js/spice/currency/1/{0}/{1}'
 weight = 100
 
-parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
+parser_re = re.compile('.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
 
 db = 1
 
 
 def normalize_name(name):
-    name = name.decode('utf-8').lower().replace('-', ' ').rstrip('s')
+    name = name.lower().replace('-', ' ').rstrip('s')
     name = re.sub(' +', ' ', name)
     return unicodedata.normalize('NFKD', name).lower()
 
@@ -90,10 +87,10 @@ def response(resp):
 def load():
     global db
 
-    current_dir = os.path.dirname(os.path.realpath(__file__))
-    json_data = open(current_dir + "/../data/currencies.json", 'r', encoding='utf-8').read()
-
-    db = json.loads(json_data)
+    with open(
+        Path(__file__).parent.parent / "data" / "currencies.json", encoding='utf-8'
+    ) as fd:
+        db = json.load(fd)
 
 
 load()
diff --git a/searx/engines/deezer.py b/searx/engines/deezer.py
index af63478fb74b2a46fd7d33e253c5537d198e8476..d176684c66dfdd0f71a3b5952453a751a4d6447e 100644
--- a/searx/engines/deezer.py
+++ b/searx/engines/deezer.py
@@ -50,7 +50,7 @@ def response(resp):
             if url.startswith('http://'):
                 url = 'https' + url[4:]
 
-            content = u'{} - {} - {}'.format(
+            content = '{} - {} - {}'.format(
                 result['artist']['name'],
                 result['album']['title'],
                 result['title'])
diff --git a/searx/engines/dictzone.py b/searx/engines/dictzone.py
index 7cc44df73d8c754cc8c593fbc0078fbc6885f74c..deba3b6e514956f3e9508050c2f7cfca50b7ff7e 100644
--- a/searx/engines/dictzone.py
+++ b/searx/engines/dictzone.py
@@ -15,10 +15,10 @@ from searx.utils import is_valid_lang
 from searx.url_utils import urljoin
 
 categories = ['general']
-url = u'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}'
+url = 'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}'
 weight = 100
 
-parser_re = re.compile(b'.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I)
+parser_re = re.compile('.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I)
 results_xpath = './/table[@id="r"]/tr'
 
 
@@ -37,7 +37,7 @@ def request(query, params):
 
     params['url'] = url.format(from_lang=from_lang[2],
                                to_lang=to_lang[2],
-                               query=query.decode('utf-8'))
+                               query=query)
 
     return params
 
diff --git a/searx/engines/digbt.py b/searx/engines/digbt.py
index ff2f9459306ff0dcba3c3e1ea4e1631dc6e77890..3bbf902c28dd6fb2e61c9ab6f67496292674bdaf 100644
--- a/searx/engines/digbt.py
+++ b/searx/engines/digbt.py
@@ -10,15 +10,11 @@
  @parse       url, title, content, magnetlink
 """
 
-from sys import version_info
 from lxml import html
 from searx.engines.xpath import extract_text
 from searx.utils import get_torrent_size
 from searx.url_utils import urljoin
 
-if version_info[0] == 3:
-    unicode = str
-
 categories = ['videos', 'music', 'files']
 paging = True
 
diff --git a/searx/engines/filecrop.py b/searx/engines/filecrop.py
index ed57a6bf3722d5390806ea77f0da0babf5299401..48c34fa897f8c27545539af30d3fdf03a4bbed25 100644
--- a/searx/engines/filecrop.py
+++ b/searx/engines/filecrop.py
@@ -1,9 +1,5 @@
 from searx.url_utils import urlencode
-
-try:
-    from HTMLParser import HTMLParser
-except:
-    from html.parser import HTMLParser
+from html.parser import HTMLParser
 
 url = 'http://www.filecrop.com/'
 search_url = url + '/search.php?{query}&size_i=0&size_f=100000000&engine_r=1&engine_d=1&engine_e=1&engine_4=1&engine_m=1&pos={index}'  # noqa
diff --git a/searx/engines/genius.py b/searx/engines/genius.py
index b265e9d7699d9406f42fd734f17b6a3fbac7e5da..aa5afad9b6ad2454187dbc35ca768c9bc0b96bf7 100644
--- a/searx/engines/genius.py
+++ b/searx/engines/genius.py
@@ -72,6 +72,7 @@ def parse_album(hit):
             result.update({'content': 'Released: {}'.format(year)})
     return result
 
+
 parse = {'lyric': parse_lyric, 'song': parse_lyric, 'artist': parse_artist, 'album': parse_album}
 
 
diff --git a/searx/engines/gentoo.py b/searx/engines/gentoo.py
index a7a966cc921b878fb4b938cffe92c705a3d8fee3..8075d580ad8404f1aeba70db1bad76788e47cabf 100644
--- a/searx/engines/gentoo.py
+++ b/searx/engines/gentoo.py
@@ -90,7 +90,7 @@ def request(query, params):
     # if our language is hosted on the main site, we need to add its name
     # to the query in order to narrow the results to that language
     if language in main_langs:
-        query += b' (' + (main_langs[language]).encode('utf-8') + b')'
+        query += ' (' + (main_langs[language]) + ')'
 
     # prepare the request parameters
     query = urlencode({'search': query})
diff --git a/searx/engines/google.py b/searx/engines/google.py
index 36ca7a116e590404a5ddbe478065c2d92cc29592..ef125f4aecbc974ed85c0ac58a7c2aef1b7b7736 100644
--- a/searx/engines/google.py
+++ b/searx/engines/google.py
@@ -89,9 +89,8 @@ url_map = 'https://www.openstreetmap.org/'\
 
 # search-url
 search_path = '/search'
-search_url = ('https://{hostname}' +
-              search_path +
-              '?{query}&start={offset}&gws_rd=cr&gbv=1&lr={lang}&hl={lang_short}&ei=x')
+search_url = ('https://{hostname}' + search_path + '?{query}'
+              '&start={offset}&gws_rd=cr&gbv=1&lr={lang}&hl={lang_short}&ei=x')
 
 time_range_search = "&tbs=qdr:{range}"
 time_range_dict = {'day': 'd',
@@ -225,7 +224,7 @@ def response(resp):
 
     instant_answer = dom.xpath('//div[@id="_vBb"]//text()')
     if instant_answer:
-        results.append({'answer': u' '.join(instant_answer)})
+        results.append({'answer': ' '.join(instant_answer)})
     try:
         results_num = int(dom.xpath('//div[@id="resultStats"]//text()')[0]
                           .split()[1].replace(',', ''))
diff --git a/searx/engines/google_videos.py b/searx/engines/google_videos.py
index 9a41b2dfa366260001a1877a64f4c3fc50880bb8..4274f0d07991218d8ee89d34950622f932d42eca 100644
--- a/searx/engines/google_videos.py
+++ b/searx/engines/google_videos.py
@@ -76,11 +76,11 @@ def response(resp):
         # get thumbnails
         script = str(dom.xpath('//script[contains(., "_setImagesSrc")]')[0].text)
         id = result.xpath('.//div[@class="s"]//img/@id')[0]
-        thumbnails_data = re.findall('s=\'(.*?)(?:\\\\[a-z,1-9,\\\\]+\'|\')\;var ii=\[(?:|[\'vidthumb\d+\',]+)\'' + id,
+        thumbnails_data = re.findall(r's=\'(.*?)(?:\\\\[a-z,1-9,\\\\]+\'|\')\;var ii=\[(?:|[\'vidthumb\d+\',]+)\'' + id,
                                      script)
         tmp = []
         if len(thumbnails_data) != 0:
-            tmp = re.findall('(data:image/jpeg;base64,[a-z,A-Z,0-9,/,\+]+)', thumbnails_data[0])
+            tmp = re.findall(r'(data:image/jpeg;base64,[a-z,A-Z,0-9,/,\+]+)', thumbnails_data[0])
         thumbnail = ''
         if len(tmp) != 0:
             thumbnail = tmp[-1]
diff --git a/searx/engines/ina.py b/searx/engines/ina.py
index 37a05f099ff38cc83af0745db02aa5355989afcd..5d59c9f1daee558d5a8e008e62cdef4a4e9de380 100644
--- a/searx/engines/ina.py
+++ b/searx/engines/ina.py
@@ -16,11 +16,7 @@ from lxml import html
 from dateutil import parser
 from searx.engines.xpath import extract_text
 from searx.url_utils import urlencode
-
-try:
-    from HTMLParser import HTMLParser
-except:
-    from html.parser import HTMLParser
+from html.parser import HTMLParser
 
 # engine dependent config
 categories = ['videos']
diff --git a/searx/engines/json_engine.py b/searx/engines/json_engine.py
index 785b0c49026272e86d45ad297f32b139e88d4124..7a48bc8cee536229822d9fc1ecf77a75912da2e2 100644
--- a/searx/engines/json_engine.py
+++ b/searx/engines/json_engine.py
@@ -1,11 +1,8 @@
-from collections import Iterable
+from collections.abc import Iterable
 from json import loads
-from sys import version_info
 from searx.url_utils import urlencode
 from searx.utils import to_string
 
-if version_info[0] == 3:
-    unicode = str
 
 search_url = None
 url_query = None
@@ -37,7 +34,7 @@ def iterate(iterable):
 def is_iterable(obj):
     if type(obj) == str:
         return False
-    if type(obj) == unicode:
+    if type(obj) == str:
         return False
     return isinstance(obj, Iterable)
 
diff --git a/searx/engines/mediawiki.py b/searx/engines/mediawiki.py
index 0607ac93b884791156b61306eb307335dfb3ffea..7e5a7198869dede4d4122f83ce34a84467e4aee7 100644
--- a/searx/engines/mediawiki.py
+++ b/searx/engines/mediawiki.py
@@ -79,7 +79,7 @@ def response(resp):
         if result.get('snippet', '').startswith('#REDIRECT'):
             continue
         url = base_url.format(language=resp.search_params['language']) +\
-            'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
+            'wiki/' + quote(result['title'].replace(' ', '_'))
 
         # append result
         results.append({'url': url,
diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
index 733ba62034c15e102e46e40d684119e3a881fa22..4a13a25dd5af3a611b7bf553092632a2ecdc15c5 100644
--- a/searx/engines/openstreetmap.py
+++ b/searx/engines/openstreetmap.py
@@ -39,7 +39,7 @@ def response(resp):
         if 'display_name' not in r:
             continue
 
-        title = r['display_name'] or u''
+        title = r['display_name'] or ''
         osm_type = r.get('osm_type', r.get('type'))
         url = result_base_url.format(osm_type=osm_type,
                                      osm_id=r['osm_id'])
@@ -51,7 +51,7 @@ def response(resp):
 
         # if no geojson is found and osm_type is a node, add geojson Point
         if not geojson and osm_type == 'node':
-            geojson = {u'type': u'Point', u'coordinates': [r['lon'], r['lat']]}
+            geojson = {'type': 'Point', 'coordinates': [r['lon'], r['lat']]}
 
         address_raw = r.get('address')
         address = {}
diff --git a/searx/engines/pubmed.py b/searx/engines/pubmed.py
index 055f092269d64adcfb5d3f004753bccbbaf8c176..82a37a564e7efca26fa1c50066215f467e40f506 100644
--- a/searx/engines/pubmed.py
+++ b/searx/engines/pubmed.py
@@ -81,7 +81,7 @@ def response(resp):
             pass
 
         if len(content) > 300:
-                    content = content[0:300] + "..."
+            content = content[0:300] + "..."
         # TODO: center snippet on query term
 
         res_dict = {'url': url,
diff --git a/searx/engines/soundcloud.py b/searx/engines/soundcloud.py
index d59755e04c5d7830f715ce87d2d1fead74197eae..296a94d07722c93a1ff12dd1799a15982eb90569 100644
--- a/searx/engines/soundcloud.py
+++ b/searx/engines/soundcloud.py
@@ -17,11 +17,7 @@ from dateutil import parser
 from searx import logger
 from searx.poolrequests import get as http_get
 from searx.url_utils import quote_plus, urlencode
-
-try:
-    from cStringIO import StringIO
-except:
-    from io import StringIO
+from io import StringIO
 
 # engine dependent config
 categories = ['music']
diff --git a/searx/engines/spotify.py b/searx/engines/spotify.py
index aed756be3a0e280d1e8e814f59be435eb4006b91..ff536e30f5a7bf51be06215f5578976ce6641a0c 100644
--- a/searx/engines/spotify.py
+++ b/searx/engines/spotify.py
@@ -45,7 +45,7 @@ def response(resp):
         if result['type'] == 'track':
             title = result['name']
             url = result['external_urls']['spotify']
-            content = u'{} - {} - {}'.format(
+            content = '{} - {} - {}'.format(
                 result['artists'][0]['name'],
                 result['album']['name'],
                 result['name'])
diff --git a/searx/engines/translated.py b/searx/engines/translated.py
index 5c7b170332c963d2c748af8230525d7348d1ce37..295089cb309d771c36c6d200eb5db0446f8f69f4 100644
--- a/searx/engines/translated.py
+++ b/searx/engines/translated.py
@@ -9,23 +9,20 @@
  @parse       url, title, content
 """
 import re
-from sys import version_info
 from searx.utils import is_valid_lang
 
-if version_info[0] == 3:
-    unicode = str
 
 categories = ['general']
-url = u'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
-web_url = u'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
+url = 'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
+web_url = 'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
 weight = 100
 
-parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
+parser_re = re.compile('.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
 api_key = ''
 
 
 def request(query, params):
-    m = parser_re.match(unicode(query, 'utf8'))
+    m = parser_re.match(query)
     if not m:
         return params
 
diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py
index 03a58a31a62eddd19cc8c56def132c0719047bc0..81cf262c50c5bd775f113fffa64e606f5d1100a6 100644
--- a/searx/engines/wikidata.py
+++ b/searx/engines/wikidata.py
@@ -374,7 +374,7 @@ def add_url(urls, result, property_id=None, default_label=None, url_prefix=None,
 
     # wiki links don't have property in wikidata page
     if link_type and 'wiki' in link_type:
-            links.append(get_wikilink(result, link_type))
+        links.append(get_wikilink(result, link_type))
     else:
         dom_element = result.xpath(property_xpath.replace('{propertyid}', property_id))
         if dom_element:
@@ -437,16 +437,16 @@ def get_geolink(result):
     latitude, longitude = coordinates.split(',')
 
     # convert to decimal
-    lat = int(latitude[:latitude.find(u'°')])
+    lat = int(latitude[:latitude.find('°')])
     if latitude.find('\'') >= 0:
-        lat += int(latitude[latitude.find(u'°') + 1:latitude.find('\'')] or 0) / 60.0
+        lat += int(latitude[latitude.find('°') + 1:latitude.find('\'')] or 0) / 60.0
     if latitude.find('"') >= 0:
         lat += float(latitude[latitude.find('\'') + 1:latitude.find('"')] or 0) / 3600.0
     if latitude.find('S') >= 0:
         lat *= -1
-    lon = int(longitude[:longitude.find(u'°')])
+    lon = int(longitude[:longitude.find('°')])
     if longitude.find('\'') >= 0:
-        lon += int(longitude[longitude.find(u'°') + 1:longitude.find('\'')] or 0) / 60.0
+        lon += int(longitude[longitude.find('°') + 1:longitude.find('\'')] or 0) / 60.0
     if longitude.find('"') >= 0:
         lon += float(longitude[longitude.find('\'') + 1:longitude.find('"')] or 0) / 3600.0
     if longitude.find('W') >= 0:
diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py
index 4dae735d173022232677a39cec5a32c7f388acc5..04e765dfd8850f684c0c339ca21c889c5c7e0b3d 100644
--- a/searx/engines/wikipedia.py
+++ b/searx/engines/wikipedia.py
@@ -16,8 +16,8 @@ from searx.url_utils import quote, urlencode
 from searx.utils import match_language
 
 # search-url
-base_url = u'https://{language}.wikipedia.org/'
-search_url = base_url + u'w/api.php?'\
+base_url = 'https://{language}.wikipedia.org/'
+search_url = base_url + 'w/api.php?'\
     'action=query'\
     '&format=json'\
     '&{query}'\
@@ -40,7 +40,7 @@ def url_lang(lang):
 # do search-request
 def request(query, params):
     if query.islower():
-        query = u'{0}|{1}'.format(query.decode('utf-8'), query.decode('utf-8').title()).encode('utf-8')
+        query = '{0}|{1}'.format(query, query.title())
 
     params['url'] = search_url.format(query=urlencode({'titles': query}),
                                       language=url_lang(params['language']))
diff --git a/searx/engines/wolframalpha_api.py b/searx/engines/wolframalpha_api.py
index 1c58c4a9b7432a5913f054b83ef9b2390648631d..9ec8b53cc246a400ba0222bf8256e17c2b4c6fda 100644
--- a/searx/engines/wolframalpha_api.py
+++ b/searx/engines/wolframalpha_api.py
@@ -45,15 +45,15 @@ def request(query, params):
 
 # replace private user area characters to make text legible
 def replace_pua_chars(text):
-    pua_chars = {u'\uf522': u'\u2192',  # rigth arrow
-                 u'\uf7b1': u'\u2115',  # set of natural numbers
-                 u'\uf7b4': u'\u211a',  # set of rational numbers
-                 u'\uf7b5': u'\u211d',  # set of real numbers
-                 u'\uf7bd': u'\u2124',  # set of integer numbers
-                 u'\uf74c': 'd',        # differential
-                 u'\uf74d': u'\u212f',  # euler's number
-                 u'\uf74e': 'i',        # imaginary number
-                 u'\uf7d9': '='}        # equals sign
+    pua_chars = {'  ': '→',  # rigth arrow
+                 '': 'ℕ',  # set of natural numbers
+                 '  ': 'ℚ',  # set of rational numbers
+                 '': 'ℝ',  # set of real numbers
+                 '  ': '   ℤ',  # set of integer numbers
+                 '': 'd',        # differential
+                 '': '     ℯ',  # euler's number
+                 '': 'i',        # imaginary number
+                 '': '='}        # equals sign
 
     for k, v in pua_chars.items():
         text = text.replace(k, v)
diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py
index 50f98d935d7460727e4987d13967d28fea7d2c60..8da0547c6cd769e7e44c1dd407ee75e0c5cac177 100644
--- a/searx/engines/xpath.py
+++ b/searx/engines/xpath.py
@@ -53,7 +53,7 @@ def extract_url(xpath_results, search_url):
     if url.startswith('//'):
         # add http or https to this kind of url //example.com/
         parsed_search_url = urlparse(search_url)
-        url = u'{0}:{1}'.format(parsed_search_url.scheme or 'http', url)
+        url = '{0}:{1}'.format(parsed_search_url.scheme or 'http', url)
     elif url.startswith('/'):
         # fix relative url to the search engine
         url = urljoin(search_url, url)
@@ -79,7 +79,7 @@ def normalize_url(url):
         p = parsed_url.path
         mark = p.find('/**')
         if mark != -1:
-            return unquote(p[mark + 3:]).decode('utf-8')
+            return unquote(p[mark + 3:])
 
     return url
 
diff --git a/searx/engines/yahoo_news.py b/searx/engines/yahoo_news.py
index 9f6a4159b3520af2f11aa5aecb838af806b6fc97..dd0e04993ab86ca0c8f622a2d4027faa4b42445f 100644
--- a/searx/engines/yahoo_news.py
+++ b/searx/engines/yahoo_news.py
@@ -58,7 +58,7 @@ def request(query, params):
 
 def sanitize_url(url):
     if ".yahoo.com/" in url:
-        return re.sub(u"\\;\\_ylt\\=.+$", "", url)
+        return re.sub("\\;\\_ylt\\=.+$", "", url)
     else:
         return url
 
diff --git a/searx/languages.py b/searx/languages.py
index cab1245412f6823e7962edb41ea873c428dc316a..d778c29dc86d570308073c326f4aace2ef3f659e 100644
--- a/searx/languages.py
+++ b/searx/languages.py
@@ -3,65 +3,65 @@
 # this file is generated automatically by utils/update_search_languages.py
 
 language_codes = (
-    (u"ar-SA", u"العربية", u"", u"Arabic"),
-    (u"bg-BG", u"Български", u"", u"Bulgarian"),
-    (u"ca-ES", u"Català", u"", u"Catalan"),
-    (u"cs-CZ", u"Čeština", u"", u"Czech"),
-    (u"da-DK", u"Dansk", u"", u"Danish"),
-    (u"de", u"Deutsch", u"", u"German"),
-    (u"de-AT", u"Deutsch", u"Österreich", u"German"),
-    (u"de-CH", u"Deutsch", u"Schweiz", u"German"),
-    (u"de-DE", u"Deutsch", u"Deutschland", u"German"),
-    (u"el-GR", u"Ελληνικά", u"", u"Greek"),
-    (u"en", u"English", u"", u"English"),
-    (u"en-AU", u"English", u"Australia", u"English"),
-    (u"en-CA", u"English", u"Canada", u"English"),
-    (u"en-GB", u"English", u"United Kingdom", u"English"),
-    (u"en-IN", u"English", u"India", u"English"),
-    (u"en-MY", u"English", u"Malaysia", u"English"),
-    (u"en-US", u"English", u"United States", u"English"),
-    (u"es", u"Español", u"", u"Spanish"),
-    (u"es-AR", u"Español", u"Argentina", u"Spanish"),
-    (u"es-ES", u"Español", u"España", u"Spanish"),
-    (u"es-MX", u"Español", u"México", u"Spanish"),
-    (u"et-EE", u"Eesti", u"", u"Estonian"),
-    (u"fa-IR", u"فارسی", u"", u"Persian"),
-    (u"fi-FI", u"Suomi", u"", u"Finnish"),
-    (u"fr", u"Français", u"", u"French"),
-    (u"fr-BE", u"Français", u"Belgique", u"French"),
-    (u"fr-CA", u"Français", u"Canada", u"French"),
-    (u"fr-CH", u"Français", u"Suisse", u"French"),
-    (u"fr-FR", u"Français", u"France", u"French"),
-    (u"he-IL", u"עברית", u"", u"Hebrew"),
-    (u"hr-HR", u"Hrvatski", u"", u"Croatian"),
-    (u"hu-HU", u"Magyar", u"", u"Hungarian"),
-    (u"id-ID", u"Indonesia", u"", u"Indonesian"),
-    (u"is-IS", u"Íslenska", u"", u"Icelandic"),
-    (u"it-IT", u"Italiano", u"", u"Italian"),
-    (u"ja-JP", u"日本語", u"", u"Japanese"),
-    (u"ko-KR", u"한국어", u"", u"Korean"),
-    (u"lt-LT", u"Lietuvių", u"", u"Lithuanian"),
-    (u"lv-LV", u"Latviešu", u"", u"Latvian"),
-    (u"ms-MY", u"Bahasa Melayu", u"", u"Malay"),
-    (u"nb-NO", u"Norsk Bokmål", u"", u"Norwegian Bokmål"),
-    (u"nl", u"Nederlands", u"", u"Dutch"),
-    (u"nl-BE", u"Nederlands", u"België", u"Dutch"),
-    (u"nl-NL", u"Nederlands", u"Nederland", u"Dutch"),
-    (u"pl-PL", u"Polski", u"", u"Polish"),
-    (u"pt", u"Português", u"", u"Portuguese"),
-    (u"pt-BR", u"Português", u"Brasil", u"Portuguese"),
-    (u"pt-PT", u"Português", u"Portugal", u"Portuguese"),
-    (u"ro-RO", u"Română", u"", u"Romanian"),
-    (u"ru-RU", u"Русский", u"", u"Russian"),
-    (u"sk-SK", u"Slovenčina", u"", u"Slovak"),
-    (u"sl-SI", u"Slovenščina", u"", u"Slovenian"),
-    (u"sr-RS", u"Српски", u"", u"Serbian"),
-    (u"sv-SE", u"Svenska", u"", u"Swedish"),
-    (u"th-TH", u"ไทย", u"", u"Thai"),
-    (u"tr-TR", u"Türkçe", u"", u"Turkish"),
-    (u"uk-UA", u"Українська", u"", u"Ukrainian"),
-    (u"vi-VN", u"Tiếng Việt", u"", u"Vietnamese"),
-    (u"zh", u"中文", u"", u"Chinese"),
-    (u"zh-CN", u"中文", u"中国", u"Chinese"),
-    (u"zh-TW", u"中文", u"台灣", u"Chinese")
+    ("ar-SA", "العربية", "", "Arabic"),
+    ("bg-BG", "Български", "", "Bulgarian"),
+    ("ca-ES", "Català", "", "Catalan"),
+    ("cs-CZ", "Čeština", "", "Czech"),
+    ("da-DK", "Dansk", "", "Danish"),
+    ("de", "Deutsch", "", "German"),
+    ("de-AT", "Deutsch", "Österreich", "German"),
+    ("de-CH", "Deutsch", "Schweiz", "German"),
+    ("de-DE", "Deutsch", "Deutschland", "German"),
+    ("el-GR", "Ελληνικά", "", "Greek"),
+    ("en", "English", "", "English"),
+    ("en-AU", "English", "Australia", "English"),
+    ("en-CA", "English", "Canada", "English"),
+    ("en-GB", "English", "United Kingdom", "English"),
+    ("en-IN", "English", "India", "English"),
+    ("en-MY", "English", "Malaysia", "English"),
+    ("en-US", "English", "United States", "English"),
+    ("es", "Español", "", "Spanish"),
+    ("es-AR", "Español", "Argentina", "Spanish"),
+    ("es-ES", "Español", "España", "Spanish"),
+    ("es-MX", "Español", "México", "Spanish"),
+    ("et-EE", "Eesti", "", "Estonian"),
+    ("fa-IR", "فارسی", "", "Persian"),
+    ("fi-FI", "Suomi", "", "Finnish"),
+    ("fr", "Français", "", "French"),
+    ("fr-BE", "Français", "Belgique", "French"),
+    ("fr-CA", "Français", "Canada", "French"),
+    ("fr-CH", "Français", "Suisse", "French"),
+    ("fr-FR", "Français", "France", "French"),
+    ("he-IL", "עברית", "", "Hebrew"),
+    ("hr-HR", "Hrvatski", "", "Croatian"),
+    ("hu-HU", "Magyar", "", "Hungarian"),
+    ("id-ID", "Indonesia", "", "Indonesian"),
+    ("is-IS", "Íslenska", "", "Icelandic"),
+    ("it-IT", "Italiano", "", "Italian"),
+    ("ja-JP", "日本語", "", "Japanese"),
+    ("ko-KR", "한국어", "", "Korean"),
+    ("lt-LT", "Lietuvių", "", "Lithuanian"),
+    ("lv-LV", "Latviešu", "", "Latvian"),
+    ("ms-MY", "Bahasa Melayu", "", "Malay"),
+    ("nb-NO", "Norsk Bokmål", "", "Norwegian Bokmål"),
+    ("nl", "Nederlands", "", "Dutch"),
+    ("nl-BE", "Nederlands", "België", "Dutch"),
+    ("nl-NL", "Nederlands", "Nederland", "Dutch"),
+    ("pl-PL", "Polski", "", "Polish"),
+    ("pt", "Português", "", "Portuguese"),
+    ("pt-BR", "Português", "Brasil", "Portuguese"),
+    ("pt-PT", "Português", "Portugal", "Portuguese"),
+    ("ro-RO", "Română", "", "Romanian"),
+    ("ru-RU", "Русский", "", "Russian"),
+    ("sk-SK", "Slovenčina", "", "Slovak"),
+    ("sl-SI", "Slovenščina", "", "Slovenian"),
+    ("sr-RS", "Српски", "", "Serbian"),
+    ("sv-SE", "Svenska", "", "Swedish"),
+    ("th-TH", "ไทย", "", "Thai"),
+    ("tr-TR", "Türkçe", "", "Turkish"),
+    ("uk-UA", "Українська", "", "Ukrainian"),
+    ("vi-VN", "Tiếng Việt", "", "Vietnamese"),
+    ("zh", "中文", "", "Chinese"),
+    ("zh-CN", "中文", "中国", "Chinese"),
+    ("zh-TW", "中文", "台灣", "Chinese")
 )
diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index 4dbcbbd28c5fd4a30b4a4a031ddf72e25a2ace4d..408d1b681f89805349c26f271982ded535c142e3 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -14,11 +14,9 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 
 (C) 2015 by Adam Tauber, <asciimoo@gmail.com>
 '''
-from sys import exit, version_info
+from sys import exit
 from searx import logger
 
-if version_info[0] == 3:
-    unicode = str
 
 logger = logger.getChild('plugins')
 
@@ -31,8 +29,8 @@ from searx.plugins import (oa_doi_rewrite,
                            tracker_url_remover,
                            vim_hotkeys)
 
-required_attrs = (('name', (str, unicode)),
-                  ('description', (str, unicode)),
+required_attrs = (('name', str),
+                  ('description', str),
                   ('default_on', bool))
 
 optional_attrs = (('js_dependencies', tuple),
diff --git a/searx/plugins/https_rewrite.py b/searx/plugins/https_rewrite.py
index 3d986770e7f00c5793cd1e6e4304eb0f4ed4e637..343f417f6caa790ea021ff4c3d71b038df550a2f 100644
--- a/searx/plugins/https_rewrite.py
+++ b/searx/plugins/https_rewrite.py
@@ -25,8 +25,6 @@ from flask_babel import gettext
 from searx import searx_dir
 from searx.url_utils import urlparse
 
-if sys.version_info[0] == 3:
-    unicode = str
 
 name = "HTTPS rewrite"
 description = gettext('Rewrite HTTP links to HTTPS if possible')
@@ -224,7 +222,7 @@ def https_url_rewrite(result):
     return result
 
 
-def on_result(request, search, result):
+def on_result(request, searchData, result):
     if result['parsed_url'].scheme == 'http':
         https_url_rewrite(result)
     return True
diff --git a/searx/plugins/oa_doi_rewrite.py b/searx/plugins/oa_doi_rewrite.py
index d4942498fd24d85f821f2bebce65a1b3f941ff8e..e526dcd314ce70f6fcd5c86e6062af4335047880 100644
--- a/searx/plugins/oa_doi_rewrite.py
+++ b/searx/plugins/oa_doi_rewrite.py
@@ -34,7 +34,7 @@ def get_doi_resolver(args, preference_doi_resolver):
     return doi_resolver_url
 
 
-def on_result(request, search, result):
+def on_result(request, searchData, result):
     doi = extract_doi(result['parsed_url'])
     if doi and len(doi) < 50:
         for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):
diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py
index 8d6c661ad7ba3331ea4467ddcb5ec29dafe482c2..ad15efeedd749ef705ab5746cd5cc7ad08933272 100644
--- a/searx/plugins/self_info.py
+++ b/searx/plugins/self_info.py
@@ -22,25 +22,25 @@ default_on = True
 
 
 # Self User Agent regex
-p = re.compile(b'.*user[ -]agent.*', re.IGNORECASE)
+p = re.compile('.*user[ -]agent.*', re.IGNORECASE)
 
 
 # attach callback to the post search hook
 #  request: flask request object
 #  ctx: the whole local context of the pre search hook
-def post_search(request, search):
-    if search.search_query.pageno > 1:
+def post_search(request, searchData):
+    if searchData.pageno > 1:
         return True
-    if search.search_query.query == b'ip':
+    if searchData.query == 'ip':
         x_forwarded_for = request.headers.getlist("X-Forwarded-For")
         if x_forwarded_for:
             ip = x_forwarded_for[0]
         else:
             ip = request.remote_addr
-        search.result_container.answers.clear()
-        search.result_container.answers.add(ip)
-    elif p.match(search.search_query.query):
+        searchData.answers.clear()
+        searchData.answers.add(ip)
+    elif p.match(searchData.query):
         ua = request.user_agent
-        search.result_container.answers.clear()
-        search.result_container.answers.add(ua)
+        searchData.answers.clear()
+        searchData.answers.add(ua)
     return True
diff --git a/searx/plugins/tracker_url_remover.py b/searx/plugins/tracker_url_remover.py
index 630c8a6386b6c06c3ec6e742bc89b5d7f7cf8cf2..6dc49285091e48ba3970d34ca17c9468bd0bab10 100644
--- a/searx/plugins/tracker_url_remover.py
+++ b/searx/plugins/tracker_url_remover.py
@@ -29,7 +29,7 @@ default_on = True
 preference_section = 'privacy'
 
 
-def on_result(request, search, result):
+def on_result(request, searchData, result):
     query = result['parsed_url'].query
 
     if query == "":
diff --git a/searx/preferences.py b/searx/preferences.py
index acaa67f6689836967698414d92447b94bc46ee1c..a964ef09ece196eb5205dfbff64cb57f2d90f9a8 100644
--- a/searx/preferences.py
+++ b/searx/preferences.py
@@ -1,14 +1,10 @@
 from base64 import urlsafe_b64encode, urlsafe_b64decode
 from zlib import compress, decompress
-from sys import version
 
 from searx import settings, autocomplete
 from searx.languages import language_codes as languages
 from searx.url_utils import parse_qs, urlencode
 
-if version[0] == '3':
-    unicode = str
-
 
 COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 5  # 5 years
 LANGUAGE_CODES = [l[0] for l in languages]
@@ -243,8 +239,8 @@ class Preferences(object):
         super(Preferences, self).__init__()
 
         self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories + ['none']),
-                                   'language': SearchLanguageSetting(settings['search']['language'],
-                                                                     choices=LANGUAGE_CODES),
+                                   'language': SearchLanguageSetting(settings['ui']['default_locale'],
+                                                                     choices=list(LANGUAGE_CODES) + ['']),
                                    'locale': EnumStringSetting(settings['ui']['default_locale'],
                                                                choices=list(settings['locales'].keys()) + ['']),
                                    'autocomplete': EnumStringSetting(settings['search']['autocomplete'],
@@ -288,11 +284,11 @@ class Preferences(object):
         settings_kv['disabled_plugins'] = ','.join(self.plugins.disabled)
         settings_kv['enabled_plugins'] = ','.join(self.plugins.enabled)
 
-        return urlsafe_b64encode(compress(urlencode(settings_kv).encode('utf-8'))).decode('utf-8')
+        return urlsafe_b64encode(compress(urlencode(settings_kv).encode()))
 
     def parse_encoded_data(self, input_data):
-        decoded_data = decompress(urlsafe_b64decode(input_data.encode('utf-8')))
-        self.parse_dict({x: y[0] for x, y in parse_qs(unicode(decoded_data)).items()})
+        decoded_data = decompress(urlsafe_b64decode(input_data.encode()))
+        self.parse_dict({x: y[0] for x, y in parse_qs(str(decoded_data)).items()})
 
     def parse_dict(self, input_data):
         for user_setting_name, user_setting in input_data.items():
diff --git a/searx/query.py b/searx/query.py
index f76bd91d3cfc5ebebdfe6cab5b2c770df0008743..4dc7ebdd2918dece633524444d41327bdeb2b1b3 100644
--- a/searx/query.py
+++ b/searx/query.py
@@ -22,10 +22,7 @@ from searx.engines import (
     categories, engines, engine_shortcuts
 )
 import re
-import sys
 
-if sys.version_info[0] == 3:
-    unicode = str
 
 VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$')
 
@@ -51,7 +48,7 @@ class RawTextQuery(object):
         self.query_parts = []
 
         # split query, including whitespaces
-        raw_query_parts = re.split(r'(\s+)' if isinstance(self.query, str) else b'(\s+)', self.query)
+        raw_query_parts = re.split(r'(\s+)' if isinstance(self.query, str) else r'(\s+)'.encode(), self.query)
 
         parse_next = True
 
@@ -76,24 +73,25 @@ class RawTextQuery(object):
                 # check if any language-code is equal with
                 # declared language-codes
                 for lc in language_codes:
-                    lang_id, lang_name, country, english_name = map(unicode.lower, lc)
+                    lang_id, lang_name, country, english_name = map(str.lower, lc)
 
                     # if correct language-code is found
                     # set it as new search-language
-                    if (lang == lang_id
-                        or lang == lang_name
-                        or lang == english_name
-                        or lang.replace('-', ' ') == country)\
-                       and lang not in self.languages:
-                            parse_next = True
-                            lang_parts = lang_id.split('-')
-                            if len(lang_parts) == 2:
-                                self.languages.append(lang_parts[0] + '-' + lang_parts[1].upper())
-                            else:
-                                self.languages.append(lang_id)
-                            # to ensure best match (first match is not necessarily the best one)
-                            if lang == lang_id:
-                                break
+                    if (
+                        lang in [lang_id, lang_name, english_name]
+                        or lang.replace("-", " ") == country  # noqa
+                    ) and lang not in self.languages:
+                        parse_next = True
+                        lang_parts = lang_id.split("-")
+                        if len(lang_parts) == 2:
+                            self.languages.append(
+                                lang_parts[0] + "-" + lang_parts[1].upper()
+                            )
+                        else:
+                            self.languages.append(lang_id)
+                        # to ensure best match (first match is not necessarily the best one)
+                        if lang == lang_id:
+                            break
 
                 # user may set a valid, yet not selectable language
                 if VALID_LANGUAGE_CODE.match(lang):
@@ -154,17 +152,17 @@ class RawTextQuery(object):
 
     def getFullQuery(self):
         # get full querry including whitespaces
-        return u''.join(self.query_parts)
+        return ''.join(self.query_parts)
 
 
-class SearchQuery(object):
+class SearchQuery:
     """container for all the search parameters (query, language, etc...)"""
 
-    def __init__(self, query, engines, categories, lang, safesearch, pageno, time_range):
-        self.query = query.encode('utf-8')
+    def __init__(self, query, engines, categories, language, safesearch, pageno, time_range):
+        self.query = query
         self.engines = engines
         self.categories = categories
-        self.lang = lang
+        self.language = language
         self.safesearch = safesearch
         self.pageno = pageno
         self.time_range = time_range
diff --git a/searx/results.py b/searx/results.py
index cb204a682fe23d6c688c85fadc545eb454efa7c5..f655544dad7b5ca80e99a175bc875be5e78dd7db 100644
--- a/searx/results.py
+++ b/searx/results.py
@@ -1,13 +1,11 @@
 import re
-import sys
 from collections import defaultdict
 from operator import itemgetter
 from threading import RLock
 from searx.engines import engines
 from searx.url_utils import urlparse, unquote
+from searx.query import SearchQuery
 
-if sys.version_info[0] == 3:
-    basestring = str
 
 CONTENT_LEN_IGNORED_CHARS_REGEX = re.compile(r'[,;:!?\./\\\\ ()-_]', re.M | re.U)
 WHITESPACE_REGEX = re.compile('( |\t|\n)+', re.M | re.U)
@@ -15,7 +13,7 @@ WHITESPACE_REGEX = re.compile('( |\t|\n)+', re.M | re.U)
 
 # return the meaningful length of the content for a result
 def result_content_len(content):
-    if isinstance(content, basestring):
+    if isinstance(content, str):
         return len(CONTENT_LEN_IGNORED_CHARS_REGEX.sub('', content))
     else:
         return 0
@@ -170,15 +168,15 @@ class ResultContainer(object):
             self.paging = True
 
         for i, result in enumerate(results):
-            if 'url' in result and not isinstance(result['url'], basestring):
+            if 'url' in result and not isinstance(result['url'], str):
                 continue
             try:
-                result['url'] = result['url'].decode('utf-8')
-            except:
+                result['url'] = result['url']
+            except KeyError:
                 pass
-            if 'title' in result and not isinstance(result['title'], basestring):
+            if 'title' in result and not isinstance(result['title'], str):
                 continue
-            if 'content' in result and not isinstance(result['content'], basestring):
+            if 'content' in result and not isinstance(result['content'], str):
                 continue
             position = i + 1
             self._merge_result(result, position)
@@ -203,14 +201,14 @@ class ResultContainer(object):
             result['parsed_url'] = result['parsed_url']._replace(scheme="http")
             result['url'] = result['parsed_url'].geturl()
 
-        result['engines'] = set([result['engine']])
+        result['engines'] = [result['engine']]
 
         # strip multiple spaces and cariage returns from content
         if result.get('content'):
             result['content'] = WHITESPACE_REGEX.sub(' ', result['content'])
 
         # check for duplicates
-        duplicated = False
+        duplicated = None
         for merged_result in self._merged_results:
             if compare_urls(result['parsed_url'], merged_result['parsed_url'])\
                and result.get('template') == merged_result.get('template'):
@@ -233,7 +231,8 @@ class ResultContainer(object):
             duplicated['positions'].append(position)
 
             # add engine to list of result-engines
-            duplicated['engines'].add(result['engine'])
+            if result['engine'] not in duplicated['engines']:
+                duplicated['engines'].append(result['engine'])
 
             # using https if possible
             if duplicated['parsed_url'].scheme != 'https' and result['parsed_url'].scheme == 'https':
@@ -315,7 +314,22 @@ class ResultContainer(object):
         resultnum_sum = sum(self._number_of_results)
         if not resultnum_sum or not self._number_of_results:
             return 0
-        return resultnum_sum / len(self._number_of_results)
+        return resultnum_sum // len(self._number_of_results)
 
     def add_unresponsive_engine(self, engine_error):
         self.unresponsive_engines.add(engine_error)
+
+
+class SearchData(SearchQuery):
+    def __init__(self, search_query, results, paging,
+                 results_number, answers, corrections, infoboxes, suggestions, unresponsive_engines):
+        super().__init__(**search_query.__dict__)
+
+        self.results = results
+        self.paging = paging
+        self.results_number = results_number
+        self.answers = answers
+        self.corrections = corrections
+        self.infoboxes = infoboxes
+        self.suggestions = suggestions
+        self.unresponsive_engines = unresponsive_engines
diff --git a/searx/search.py b/searx/search.py
index b81542f1afe5112b6616d13cb18e9dd9b734510d..b208908c5aa9c6606dc116173937b2767d824095 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -16,31 +16,27 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 '''
 
 import gc
-import sys
 import threading
 from time import time
 from uuid import uuid4
-from flask_babel import gettext
+
 import requests.exceptions
+from flask_babel import gettext
+
 import searx.poolrequests as requests_lib
+from searx import search_database
+from searx import logger
+from searx.answerers import ask
 from searx.engines import (
     categories, engines, settings
 )
-from searx.answerers import ask
-from searx.utils import gen_useragent
+from searx.exceptions import SearxParameterException
 from searx.query import RawTextQuery, SearchQuery, VALID_LANGUAGE_CODE
-from searx.results import ResultContainer
-from searx import logger
+from searx.results import ResultContainer, SearchData
+from searx.utils import gen_useragent
 from searx.plugins import plugins
-from searx.exceptions import SearxParameterException
 
-try:
-    from thread import start_new_thread
-except:
-    from _thread import start_new_thread
-
-if sys.version_info[0] == 3:
-    unicode = str
+from _thread import start_new_thread
 
 logger = logger.getChild('search')
 
@@ -137,7 +133,7 @@ def search_one_request_safe(engine_name, query, request_params, result_container
         else:
             result_container.add_unresponsive_engine((
                 engine_name,
-                u'{0}: {1}'.format(gettext('unexpected crash'), e),
+                '{0}: {1}'.format(gettext('unexpected crash'), e),
             ))
             # others errors
             logger.exception('engine {0} : exception : {1}'.format(engine_name, e))
@@ -189,164 +185,44 @@ def default_request_params():
     }
 
 
-def get_search_query_from_webapp(preferences, form):
-    # no text for the query ?
-    if not form.get('q'):
-        raise SearxParameterException('q', '')
-
-    # set blocked engines
-    disabled_engines = preferences.engines.get_disabled()
-
-    # parse query, if tags are set, which change
-    # the serch engine or search-language
-    raw_text_query = RawTextQuery(form['q'], disabled_engines)
-    raw_text_query.parse_query()
-
-    # set query
-    query = raw_text_query.getSearchQuery()
-
-    # get and check page number
-    pageno_param = form.get('pageno', '1')
-    if not pageno_param.isdigit() or int(pageno_param) < 1:
-        raise SearxParameterException('pageno', pageno_param)
-    query_pageno = int(pageno_param)
-
-    # get language
-    # set specific language if set on request, query or preferences
-    # TODO support search with multible languages
-    if len(raw_text_query.languages):
-        query_lang = raw_text_query.languages[-1]
-    elif 'language' in form:
-        query_lang = form.get('language')
-    else:
-        query_lang = preferences.get_value('language')
-
-    # check language
-    if not VALID_LANGUAGE_CODE.match(query_lang):
-        raise SearxParameterException('language', query_lang)
-
-    # get safesearch
-    if 'safesearch' in form:
-        query_safesearch = form.get('safesearch')
-        # first check safesearch
-        if not query_safesearch.isdigit():
-            raise SearxParameterException('safesearch', query_safesearch)
-        query_safesearch = int(query_safesearch)
-    else:
-        query_safesearch = preferences.get_value('safesearch')
+class Search:
+    """Search information manager"""
 
-    # safesearch : second check
-    if query_safesearch < 0 or query_safesearch > 2:
-        raise SearxParameterException('safesearch', query_safesearch)
+    def __init__(self, cachecls=search_database.CacheInterface):
+        self.cache = cachecls()
 
-    # get time_range
-    query_time_range = form.get('time_range')
+    def __call__(self, request):
+        """ Entry point to perform search request on engines
+        """
+        search_query = self.get_search_query_from_webapp(request.preferences, request.form)
+        searchData = self.cache.read(search_query)
 
-    # check time_range
-    if query_time_range not in ('None', None, '', 'day', 'week', 'month', 'year'):
-        raise SearxParameterException('time_range', query_time_range)
+        if searchData is None:
+            result_container = self.search(search_query)
+            searchData = self.create_search_data(search_query, result_container)
+            self.cache.save(searchData)
 
-    # query_engines
-    query_engines = raw_text_query.engines
+        self.search_with_plugins(request, searchData)
+        return searchData
 
-    # query_categories
-    query_categories = []
+    def search(self, search_query):
+        """ do search-request
 
-    # if engines are calculated from query,
-    # set categories by using that informations
-    if query_engines and raw_text_query.specific:
-        additional_categories = set()
-        for engine in query_engines:
-            if 'from_bang' in engine and engine['from_bang']:
-                additional_categories.add('none')
-            else:
-                additional_categories.add(engine['category'])
-        query_categories = list(additional_categories)
-
-    # otherwise, using defined categories to
-    # calculate which engines should be used
-    else:
-        # set categories/engines
-        load_default_categories = True
-        for pd_name, pd in form.items():
-            if pd_name == 'categories':
-                query_categories.extend(categ for categ in map(unicode.strip, pd.split(',')) if categ in categories)
-            elif pd_name == 'engines':
-                pd_engines = [{'category': engines[engine].categories[0],
-                               'name': engine}
-                              for engine in map(unicode.strip, pd.split(',')) if engine in engines]
-                if pd_engines:
-                    query_engines.extend(pd_engines)
-                    load_default_categories = False
-            elif pd_name.startswith('category_'):
-                category = pd_name[9:]
-
-                # if category is not found in list, skip
-                if category not in categories:
-                    continue
-
-                if pd != 'off':
-                    # add category to list
-                    query_categories.append(category)
-                elif category in query_categories:
-                    # remove category from list if property is set to 'off'
-                    query_categories.remove(category)
-
-        if not load_default_categories:
-            if not query_categories:
-                query_categories = list(set(engine['category']
-                                            for engine in query_engines))
-        else:
-            # if no category is specified for this search,
-            # using user-defined default-configuration which
-            # (is stored in cookie)
-            if not query_categories:
-                cookie_categories = preferences.get_value('categories')
-                for ccateg in cookie_categories:
-                    if ccateg in categories:
-                        query_categories.append(ccateg)
-
-            # if still no category is specified, using general
-            # as default-category
-            if not query_categories:
-                query_categories = ['general']
-
-            # using all engines for that search, which are
-            # declared under the specific categories
-            for categ in query_categories:
-                query_engines.extend({'category': categ,
-                                      'name': engine.name}
-                                     for engine in categories[categ]
-                                     if (engine.name, categ) not in disabled_engines)
-
-    return SearchQuery(query, query_engines, query_categories,
-                       query_lang, query_safesearch, query_pageno, query_time_range)
-
-
-class Search(object):
-
-    """Search information container"""
-
-    def __init__(self, search_query):
-        # init vars
-        super(Search, self).__init__()
-        self.search_query = search_query
-        self.result_container = ResultContainer()
-
-    # do search-request
-    def search(self):
+        Return a ResultContainer object
+        """
         global number_of_searches
+        result_container = ResultContainer()
 
         # start time
         start_time = time()
 
         # answeres ?
-        answerers_results = ask(self.search_query)
+        answerers_results = ask(search_query)
 
         if answerers_results:
             for results in answerers_results:
-                self.result_container.extend('answer', results)
-            return self.result_container
+                result_container.extend('answer', results)
+            return result_container
 
         # init vars
         requests = []
@@ -358,8 +234,6 @@ class Search(object):
         # user_agent = request.headers.get('User-Agent', '')
         user_agent = gen_useragent()
 
-        search_query = self.search_query
-
         # max of all selected engine timeout
         timeout_limit = 0
 
@@ -392,7 +266,7 @@ class Search(object):
             if hasattr(engine, 'language') and engine.language:
                 request_params['language'] = engine.language
             else:
-                request_params['language'] = search_query.lang
+                request_params['language'] = search_query.language
 
             # 0 = None, 1 = Moderate, 2 = Strict
             request_params['safesearch'] = search_query.safesearch
@@ -406,31 +280,113 @@ class Search(object):
 
         if requests:
             # send all search-request
-            search_multiple_requests(requests, self.result_container, start_time, timeout_limit)
+            search_multiple_requests(requests, result_container, start_time, timeout_limit)
             start_new_thread(gc.collect, tuple())
 
         # return results, suggestions, answers and infoboxes
-        return self.result_container
-
-
-class SearchWithPlugins(Search):
-
-    """Similar to the Search class but call the plugins."""
-
-    def __init__(self, search_query, ordered_plugin_list, request):
-        super(SearchWithPlugins, self).__init__(search_query)
-        self.ordered_plugin_list = ordered_plugin_list
-        self.request = request
-
-    def search(self):
-        if plugins.call(self.ordered_plugin_list, 'pre_search', self.request, self):
-            super(SearchWithPlugins, self).search()
-
-        plugins.call(self.ordered_plugin_list, 'post_search', self.request, self)
+        return result_container
+
+    def search_with_plugins(self, request, searchData):
+        ordered_plugin = request.user_plugins
+        plugins.call(ordered_plugin, 'post_search', request, searchData)
+
+        for result in searchData.results:
+            plugins.call(ordered_plugin, 'on_result', request, searchData, result)
+
+    def get_search_query_from_webapp(self, preferences, form):
+        # no text for the query ?
+        if not form.get('q'):
+            raise SearxParameterException('q', '')
+
+        # set blocked engines
+        disabled_engines = preferences.engines.get_disabled()
+
+        # parse query, if tags are set, which change
+        # the serch engine or search-language
+        raw_text_query = RawTextQuery(form['q'], disabled_engines)
+        raw_text_query.parse_query()
+
+        # set query
+        query = raw_text_query.getSearchQuery()
+
+        # get and check page number
+        pageno_param = form.get('pageno', '1')
+        if not pageno_param.isdigit() or int(pageno_param) < 1:
+            raise SearxParameterException('pageno', pageno_param)
+        query_pageno = int(pageno_param)
+
+        # get language
+        # set specific language if set on request, query or preferences
+        # TODO support search with multible languages
+        if len(raw_text_query.languages):
+            query_lang = raw_text_query.languages[-1]
+        elif 'language' in form:
+            query_lang = form.get('language')
+        else:
+            query_lang = preferences.get_value('language')
+
+        # check language
+        if not VALID_LANGUAGE_CODE.match(query_lang):
+            raise SearxParameterException('language', query_lang)
+
+        # get safesearch
+        if 'safesearch' in form:
+            query_safesearch = form.get('safesearch')
+            # first check safesearch
+            if not query_safesearch.isdigit():
+                raise SearxParameterException('safesearch', query_safesearch)
+            query_safesearch = int(query_safesearch)
+        else:
+            query_safesearch = preferences.get_value('safesearch')
 
-        results = self.result_container.get_ordered_results()
+        # safesearch : second check
+        if query_safesearch < 0 or query_safesearch > 2:
+            raise SearxParameterException('safesearch', query_safesearch)
 
+        # get time_range
+        query_time_range = form.get('time_range')
+
+        # check time_range
+        if query_time_range not in ('None', None, '', 'day', 'week', 'month', 'year'):
+            raise SearxParameterException('time_range', query_time_range)
+
+        # query_engines
+        query_engines = raw_text_query.engines
+
+        # we only need to check the categories parameter set by the caller (not by the user)
+        # so we can assume it contains a list of categories
+        query_categories = form.get('categories')
+
+        def append_to_engines(cat):
+            # protect agains custom category provided by the user
+            engines = categories.get(cat)
+            if engines is None:
+                return
+            for engine in engines:
+                if (engine.name, cat) not in disabled_engines:
+                    query_engines.append({'category': cat, 'name': engine.name})
+
+        # on top of the category field we have query_categories, which will be the engines to
+        # use to perform the search.
+        for category in query_categories:
+            append_to_engines(category)
+
+        return SearchQuery(query, query_engines, query_categories, query_lang, query_safesearch, query_pageno,
+                           query_time_range)
+
+    def create_search_data(self, q, r):
+        results_number = r.results_number()
+        if results_number < r.results_length():
+            results_number = 0
+        results = r.get_ordered_results()
         for result in results:
-            plugins.call(self.ordered_plugin_list, 'on_result', self.request, self, result)
-
-        return self.result_container
+            if 'publishedDate' in result:
+                try:
+                    result['pubdate'] = result['publishedDate'].strftime('%Y-%m-%d %H:%M:%S')
+                finally:
+                    result['publishedDate'] = None
+        if q.time_range is None:
+            q.time_range = ""
+
+        return SearchData(q, results, r.paging, results_number, r.answers, r.corrections,
+                          r.infoboxes, r.suggestions, r.unresponsive_engines)
diff --git a/searx/search_database.py b/searx/search_database.py
new file mode 100644
index 0000000000000000000000000000000000000000..0547da4fc1418f4647c74a93df112883fafa6c8c
--- /dev/null
+++ b/searx/search_database.py
@@ -0,0 +1,111 @@
+import threading
+import redis
+import pickle
+import copy
+
+from searx import settings
+from searx.query import SearchQuery
+
+
+class CacheInterface:
+    """ Cache interface to store SearchData object
+    """
+    def read(self, q):
+        pass
+
+    def save(self, d):
+        pass
+
+    def update(self, d):
+        pass
+
+    def get_twenty_queries(self, x):
+        return []
+
+
+class RedisCache(CacheInterface):
+    def __init__(self):
+        self.pool = redis.ConnectionPool(host=settings['redis']['host'])
+        self.running = threading.Event()
+
+    def make_key(self, q):
+        if q.time_range is None:
+            q.time_range = ""
+
+        return "SEARCH_HISTORY:{}:{}:{}:{}:{}:{}:{}".format(
+            q.query,
+            q.engines,
+            q.categories[0],
+            q.language,
+            q.safesearch,
+            q.pageno,
+            q.time_range,
+        )
+
+    def _get_connection(self):
+        return redis.Redis(connection_pool=self.pool)
+
+    def read(self, q):
+        conn = self._get_connection()
+        key = self.make_key(q)
+        response = conn.get(key)
+        if not response:
+            return None
+        return pickle.loads(response)
+
+    def _save(self, d):
+        conn = self._get_connection()
+        key = self.make_key(d)
+        history = conn.incr("SEARCH_HISTORY_INDEX")
+        conn.zadd("SEARCH_HISTORY_KEYS", {key: history})
+        conn.set(key, pickle.dumps(d, protocol=4))
+
+    def save(self, d):
+        data = copy.deepcopy(d)
+        threading.Thread(
+            target=self._save,
+            args=(data,),
+            name='save_search_' + str(data)
+        ).start()
+
+    def get_twenty_queries(self, x):
+        result = []
+
+        conn = self._get_connection()
+        keys = conn.zrange('SEARCH_HISTORY_KEYS', int(x), int(x) + 20)
+        if not keys:
+            return result
+
+        pipe = conn.pipeline()
+        for key in keys:
+            pipe.get(key)
+        output = pipe.execute()
+        for row in output:
+            row = pickle.loads(row)
+            result.append(
+                SearchQuery(
+                    row.query,
+                    row.engines,
+                    row.categories,
+                    row.language,
+                    row.safesearch,
+                    row.pageno,
+                    row.time_range,
+                )
+            )
+
+        return result
+
+    def update(self, d):
+        conn = self._get_connection()
+        key = self.make_key(d)
+        current = self.read(d)
+        current.results = d.results
+        current.paging = d.paging
+        current.results_number = d.results_number
+        current.answers = d.answers
+        current.corrections = d.corrections
+        current.infoboxes = d.infoboxes
+        current.suggestions = d.suggestions
+        current.unresponsive_engines = d.unresponsive_engines
+        conn.set(key, pickle.dumps(current, protocol=4))
diff --git a/searx/settings.yml b/searx/settings.yml
index 0be07b1e57ff0cde9f9d8a47ed6991a3c30510bf..417f06d39053f49d9df6ae5c04616e5f6172b788 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1,26 +1,32 @@
 general:
     debug : False # Debug mode, only for development
-    instance_name : "searx" # displayed name
+    instance_name : "/e/ spot" # displayed name
 
 search:
-    safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
-    autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
-    language : "en-US"
+    safe_search : 2 # Filter results. 0: None, 1: Moderate, 2: Strict
+    autocomplete : "duckduckgo" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
     ban_time_on_fail : 5 # ban time in seconds after engine errors
     max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
 
 server:
     port : 8888
-    bind_address : "127.0.0.1" # address to listen on
+    bind_address : "0.0.0.0" # address to listen on
     secret_key : "ultrasecretkey" # change this!
     base_url : False # Set custom base_url. Possible values: False or "https://your.custom.host/location/"
     image_proxy : False # Proxying image results through searx
     http_protocol_version : "1.0"  # 1.0 and 1.1 are supported
 
+redis:
+    enable: False
+    host : "127.0.0.1"
+    user : "searx"
+    password : "password" # change this!
+    upgrade_history: 86400 # in seconds (1day = 86400s)
+
 ui:
     static_path : "" # Custom static path - leave it blank if you didn't change
     templates_path : "" # Custom templates path - leave it blank if you didn't change
-    default_theme : oscar # ui theme
+    default_theme : eelo # ui theme
     default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section
     theme_args :
         oscar_style : logicodev # default style of oscar
@@ -100,6 +106,7 @@ engines:
   - name : bing videos
     engine : bing_videos
     shortcut : biv
+    disabled: true
 
   - name : bitbucket
     engine : xpath
@@ -147,6 +154,7 @@ engines:
     engine : deviantart
     shortcut : da
     timeout: 3.0
+    disabled : True
 
   - name : ddg definitions
     engine : duckduckgo_definitions
@@ -186,7 +194,6 @@ engines:
   - name : duckduckgo
     engine : duckduckgo
     shortcut : ddg
-    disabled : True
 
   - name : duckduckgo images
     engine : duckduckgo_images
@@ -281,6 +288,8 @@ engines:
   - name : google
     engine : google
     shortcut : go
+    weight : 5
+    disabled : True
 
   - name : google images
     engine : google_images
@@ -420,7 +429,7 @@ engines:
     engine : nyaa
     shortcut : nt
     disabled : True
-  
+
   - name : acgsou
     engine : acgsou
     shortcut : acg
diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml
deleted file mode 100644
index 070a0edb6fa0ec0daf000f0d1a6038817188d075..0000000000000000000000000000000000000000
--- a/searx/settings_robot.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-general:
-    debug : False
-    instance_name : "searx_test"
-
-search:
-    safe_search : 0
-    autocomplete : ""
-    language: "all"
-
-server:
-    port : 11111
-    bind_address : 127.0.0.1
-    secret_key : "ultrasecretkey" # change this!
-    base_url : False
-    image_proxy : False
-    http_protocol_version : "1.0"
-
-ui:
-    static_path : ""
-    templates_path : ""
-    default_theme : oscar
-    default_locale : ""
-
-outgoing:
-    request_timeout : 1.0 # seconds
-    useragent_suffix : ""
-
-engines:
-  - name : general dummy
-    engine : dummy
-    categories : general
-    shortcut : gd
-
-  - name : dummy dummy
-    engine : dummy
-    categories : dummy
-    shortcut : dd
-
-locales:
-    en : English
-    hu : Magyar
diff --git a/searx/static/themes/eelo/README.rst b/searx/static/themes/eelo/README.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e7daa8719768c5a2a2a0095034fad618bdf9768e
--- /dev/null
+++ b/searx/static/themes/eelo/README.rst
@@ -0,0 +1,17 @@
+install dependencies
+~~~~~~~~~~~~~~~~~~~~
+
+run this command in the directory ``searx/static/themes/oscar``
+
+``npm install``
+
+compile sources
+~~~~~~~~~~~~~~~
+
+run this command in the directory ``searx/static/themes/oscar``
+
+``grunt``
+
+or in the root directory:
+
+``make grunt``
diff --git a/searx/static/themes/eelo/css/eelo.css b/searx/static/themes/eelo/css/eelo.css
new file mode 100644
index 0000000000000000000000000000000000000000..86cbd50df6425816bc493bcb3328c74ef1e0df58
--- /dev/null
+++ b/searx/static/themes/eelo/css/eelo.css
@@ -0,0 +1,1065 @@
+.container-padding,
+nav {
+  padding-left: 16px;
+  padding-right: 16px;
+}
+.color-transition,
+a {
+  transition: color 0.2s ease-in-out;
+}
+.border-color-transition {
+  transition: border-color 0.2s ease-in-out;
+}
+.fill-transition,
+.checkmark .icon {
+  transition: fill 0.2s ease-in-out;
+}
+.box-shadow-transition,
+#search_form #search_input_container {
+  transition: box-shadow 0.2s ease-in-out;
+}
+.disabled,
+[disabled],
+#preferences #engines .engine input:checked ~ .data {
+  opacity: .4;
+}
+#pagination {
+  margin-top: 48px;
+  display: flex;
+  justify-content: space-between;
+}
+.container {
+  max-width: 1100px;
+  padding-left: 16px;
+  padding-right: 16px;
+  display: flex;
+  justify-content: space-between;
+  margin: auto;
+}
+.container > :first-child {
+  max-width: 600px;
+  width: 600px;
+}
+.container > :last-child:not(:first-child) {
+  max-width: 400px;
+  width: 400px;
+}
+.container.full {
+  max-width: 100%;
+}
+.container.full > :first-child {
+  max-width: 100%;
+  width: 100%;
+}
+.container.full > :last-child:not(:first-child) {
+  display: none;
+}
+.container.full #pagination {
+  max-width: 400px;
+  width: 400px;
+  margin: auto;
+  justify-content: space-around;
+}
+#search_bar_area {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+#search_bar_area #search_form,
+#no_results_msg,
+.content-small-centered {
+  max-width: 600px;
+  margin: auto;
+}
+#no_results_msg,
+#page_not_found_404 {
+  text-align: center;
+  margin-top: 64px;
+  margin-bottom: 64px;
+}
+#no_results_msg img,
+#page_not_found_404 img {
+  max-width: 70%;
+}
+#errors {
+  border: 2px solid #e06572;
+  border-radius: 8px;
+  padding: 8px;
+}
+#errors .title {
+  margin-top: 0;
+  margin-bottom: 8px;
+}
+#errors pre {
+  background-color: rgba(224, 101, 114, 0.1);
+}
+.inline {
+  display: flex;
+  flex-direction: row;
+}
+@media screen and (max-width: 1100px) {
+  .container {
+    flex-direction: column-reverse;
+  }
+  .container > * {
+    margin: auto;
+  }
+  #preferences.container {
+    flex-direction: column;
+    margin-top: 16px;
+  }
+}
+@media screen and (max-width: 600px) {
+  .container {
+    max-width: 100%;
+    padding-left: 16px;
+    padding-right: 16px;
+  }
+  .container > :first-child,
+  .container > :last-child:not(:first-child) {
+    max-width: 100%;
+    width: 100%;
+  }
+  main {
+    margin-top: 16px;
+  }
+  #search_input_container {
+    margin-left: 16px;
+    margin-right: 16px;
+  }
+  .container.full #pagination {
+    max-width: 100%;
+    width: 100%;
+  }
+}
+#index {
+  max-width: 600px;
+  margin: auto;
+}
+#index img {
+  width: 300px;
+  display: block;
+  margin: auto;
+  margin-top: 64px;
+  margin-bottom: 64px;
+}
+#index img#logo_inline {
+  display: none;
+}
+@media screen and (max-width: 600px) {
+  #index img {
+    width: 50vmin;
+    margin-bottom: 24px;
+  }
+}
+@media screen and (max-height: 600px) and (orientation: landscape) {
+  #index img {
+    width: 70vmin;
+    margin-top: 32px;
+    display: none;
+  }
+  #index img#logo_inline {
+    display: block;
+  }
+}
+.block,
+.btn.btn-block {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+}
+.text-muted {
+  color: rgba(0, 0, 0, 0.4);
+}
+.danger,
+.btn.danger {
+  color: #e06572;
+}
+.widget,
+.btn,
+.custom-select:not(.flat) {
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  padding: 4px 12px;
+  background-color: transparent;
+  transition: border-color 0.2s ease-in-out, color 0.2s ease-in-out, background-color 0.2s ease-in-out;
+}
+.btn {
+  padding: 8px 16px;
+  text-transform: capitalize;
+  background-color: transparent;
+  border-radius: 8px;
+  text-align: center;
+  font-size: 16px;
+  font-weight: bold;
+  cursor: pointer;
+}
+.btn:not(:disabled) {
+  color: #5068dd;
+  border-color: #5068dd;
+}
+.btn:hover:not(:disabled) {
+  border-color: #2344a2;
+  color: #2344a2;
+}
+.btn.primary,
+input.btn[type="submit"] {
+  background-color: #5068dd;
+  color: #ffffff;
+  border-color: rgba(0, 0, 0, 0.2);
+}
+.btn.primary:hover,
+input.btn[type="submit"]:hover {
+  color: #ffffff;
+  background-color: #2344a2;
+}
+.btn.danger {
+  color: #e06572;
+  border-color: #e06572;
+}
+.btn.danger:hover {
+  border-color: rgba(0, 0, 0, 0.2);
+  background-color: #e06572;
+  color: #ffffff;
+}
+.btn.btn-flat {
+  border: none;
+  border-radius: 0;
+  background-color: transparent;
+}
+.btn.btn-flat:hover {
+  color: #2344a2;
+}
+.btn.plain-white {
+  border-color: rgba(255, 255, 255, 0.4);
+  color: rgba(255, 255, 255, 0.8);
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.checkmark .icon {
+  fill: #60686f;
+}
+.checkmark .icon.checked {
+  fill: #5068dd;
+}
+.checkmark_input {
+  display: none;
+}
+.checkmark_input.inverted:checked + .checkmark .checked {
+  display: none;
+}
+.checkmark_input.inverted:checked + .checkmark .unchecked {
+  display: initial;
+}
+.checkmark_input.inverted:not(:checked) + .checkmark .checked {
+  display: initial;
+}
+.checkmark_input.inverted:not(:checked) + .checkmark .unchecked {
+  display: none;
+}
+.collapser input:checked ~ .collapse {
+  display: initial;
+}
+.collapser input:not(:checked) ~ .collapse {
+  display: none;
+}
+.custom-select {
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  font-weight: normal;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
+cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn
+sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8
+6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0
+ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w
+Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
+7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
+}
+.custom-select.flat {
+  border: none;
+}
+.custom-select:not(.flat) {
+  width: 100%;
+  border-radius: 50px;
+}
+html {
+  position: relative;
+  min-height: 100%;
+  color: #60686f;
+}
+body {
+  margin: 0px;
+  padding: 0px;
+  font-size: 16px;
+  margin-bottom: 120px;
+  background-color: white;
+  font-family: 'Roboto', "Cantarell", Helvetica, Arial, sans-serif;
+}
+body.lock {
+  overflow: hidden;
+}
+body * {
+  font-family: sans-serif, "Cantarell", 'Roboto', Helvetica, Arial;
+}
+input,
+select {
+  box-shadow: none !important;
+}
+a {
+  color: #1f6ed7;
+}
+a,
+select,
+a:focus,
+select:focus,
+a:active,
+select:active,
+a:hover,
+select:hover {
+  outline: none;
+  text-decoration: none;
+}
+label {
+  color: #5c6469;
+}
+section {
+  margin-bottom: 32px;
+}
+ul > li {
+  margin-bottom: 8px;
+}
+fieldset {
+  border: none;
+  padding: 0px;
+}
+pre {
+  font-family: 'Courier New', Courier, monospace;
+  background: rgba(0, 0, 0, 0.1);
+  padding: 8px 16px;
+  border-radius: 8px;
+  white-space: pre-line;
+}
+footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: auto;
+  text-align: center;
+  color: #c1c1c1;
+  padding-bottom: 8px;
+}
+footer .links > :first-child {
+  margin-right: 8px;
+}
+.hidden,
+#icons {
+  display: none;
+}
+#image_view_modal {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.9);
+  z-index: 100;
+}
+#image_view_modal button {
+  display: block;
+  width: 100%;
+  text-align: right;
+  background: none;
+  border: none;
+}
+#image_view_modal button .icon {
+  fill: white;
+}
+#image_view_modal .card-container {
+  display: flex;
+  height: 100%;
+}
+#image_view_modal #image_view_card {
+  margin: auto;
+  max-width: 600px;
+  max-height: 80vh;
+}
+@media screen and (max-width: 600px) {
+  #image_view_modal #image_view_card {
+    margin-left: 16px;
+    margin-right: 16px;
+    max-width: 100%;
+    width: 100%;
+  }
+}
+#image_view_modal #image_view_image {
+  display: block;
+  max-width: 100%;
+  max-height: 70vh;
+  background-color: white;
+  margin: auto;
+}
+#image_view_modal .options {
+  margin-top: 8px;
+}
+#image_view_modal .btn {
+  border-color: rgba(255, 255, 255, 0.4);
+  color: rgba(255, 255, 255, 0.8);
+  background-color: rgba(0, 0, 0, 0.5);
+  display: inline-block;
+  margin-right: 8px;
+}
+nav {
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  text-transform: capitalize;
+  margin-bottom: 24px;
+}
+nav a {
+  color: #868686;
+}
+nav a:hover {
+  color: #5068dd;
+}
+nav #eelo_links > * {
+  margin-right: 32px;
+}
+#nav_toggle_btn {
+  display: none;
+}
+@media screen and (max-width: 600px) {
+  nav {
+    position: fixed;
+    right: 0;
+    top: 0;
+    flex-direction: column;
+    height: 100%;
+    background-color: white;
+    z-index: 1000;
+    width: 280px;
+    min-width: 280px;
+    max-width: 280px;
+    align-items: unset;
+    box-shadow: 0 0 0 rgba(0, 0, 0, 0.2);
+    transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
+    padding: 0;
+  }
+  nav > :first-child {
+    margin-top: 8px;
+  }
+  nav > :last-child {
+    margin-bottom: 8px;
+  }
+  nav a {
+    display: block;
+    padding: 8px 16px;
+  }
+  #nav_toggle_btn {
+    display: block;
+    position: absolute;
+    top: 24px;
+    right: 8px;
+    z-index: 1001;
+  }
+  #nav_toggle:checked ~ #nav_toggle_btn > .menu-open {
+    display: none;
+  }
+  #nav_toggle:checked ~ #nav_toggle_btn > .menu-close {
+    display: initial;
+  }
+  #nav_toggle:checked ~ nav {
+    box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
+    transform: translateX(0);
+  }
+  #nav_toggle:checked ~ #nav_toggle_btn {
+    position: fixed;
+  }
+  #nav_toggle:not(:checked) ~ #nav_toggle_btn > .menu-open {
+    display: initial;
+  }
+  #nav_toggle:not(:checked) ~ #nav_toggle_btn > .menu-close {
+    display: none;
+  }
+  #nav_toggle:not(:checked) ~ nav {
+    transform: translateX(100%);
+  }
+}
+#search_form #search_input_container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  border: 2px solid rgba(0, 0, 0, 0.24);
+  border-radius: 50px;
+  height: 38px;
+}
+#search_form #search_input_container:hover,
+#search_form #search_input_container:active {
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.13);
+}
+#search_form #search_input_container #q {
+  font-size: 16px;
+  border: none;
+  height: 100%;
+  width: 100%;
+  min-width: 0;
+  padding-left: 16px;
+  background-color: transparent;
+}
+#search_form #search_input_container #q:focus {
+  outline: none;
+}
+#search_form #search_input_container button[type="submit"] {
+  position: relative;
+  height: 100%;
+  width: 38px;
+  min-width: 38px;
+  border: none;
+  background: none;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+#search_form #search_input_container button[type="submit"] .icon {
+  transition: fill 0.2s ease-in-out, transform 0.1s ease-in-out;
+}
+#search_form #search_input_container button[type="submit"]:hover .icon {
+  fill: #5068dd;
+  transform: scale(1.2);
+}
+#search_form #logo,
+#search_form #logo_link {
+  height: 32px;
+}
+#search_form #logo_link {
+  padding-left: 4px;
+}
+#search_form #search_input_container.rtl #q {
+  margin-left: 0;
+  padding-right: 16px;
+}
+#search_form #search_input_container.rtl #logo_link {
+  padding-left: 0;
+  padding-right: 4px;
+}
+#search_form .twitter-typeahead {
+  position: unset !important;
+  background-color: transparent;
+  width: 100%;
+  height: 100%;
+}
+#search_form input.tt-hint {
+  display: none;
+}
+#search_form .tt-dropdown-menu {
+  position: absolute;
+  left: 0;
+  right: 0 !important;
+  top: calc(116%) !important;
+  border-radius: 8px;
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  width: 100% !important;
+  box-sizing: border-box !important;
+  background-color: #eeeeee;
+  padding-left: 16px;
+  padding-right: 16px;
+}
+#search_form .tt-dropdown-menu .tt-cursor,
+#search_form .tt-dropdown-menu .tt-highlight {
+  font-weight: bold;
+}
+#search_form.inline-search .tt-dropdown-menu {
+  padding-left: 52px;
+}
+#search_form #search_params {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-bottom: 16px;
+  padding-top: 16px;
+  padding-left: 24px;
+  padding-right: 24px;
+}
+#search_form #search_params select,
+#search_form #search_params label {
+  font-size: 14px;
+}
+#search_form #search_params select {
+  color: rgba(0, 0, 0, 0.5);
+  text-align: right;
+  padding-right: 32px;
+}
+#search_form #search_params #time_and_lang {
+  text-align: right;
+}
+#search_form #search_params #time_and_lang > * {
+  width: 160px;
+}
+#search_form .search_categories,
+#search_form #categories {
+  text-transform: capitalize;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  position: relative;
+  flex: 100%;
+}
+#search_form .search_categories label,
+#search_form #categories label {
+  flex-basis: auto;
+  font-size: 14px;
+  font-weight: normal;
+  margin-right: 16px;
+  cursor: pointer;
+}
+#search_form .search_categories input[type="radio"]:checked + label,
+#search_form #categories input[type="radio"]:checked + label {
+  color: #5068dd;
+  font-weight: bold;
+}
+#search_form #more_categories {
+  position: absolute;
+  top: 24px;
+  display: flex;
+  flex-direction: column;
+  border-radius: 8px;
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  background-color: #eeeeee;
+  padding-bottom: 8px;
+  padding-top: 8px;
+  left: 0;
+  z-index: 998;
+}
+#search_form #more_categories > label {
+  padding: 16px;
+  padding-bottom: 8px;
+  padding-top: 8px;
+  white-space: nowrap;
+  margin-right: 0;
+}
+#search_form #more_categories > label:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+#more_categories_container {
+  border-left: 1px solid rgba(0, 0, 0, 0.24);
+  padding-left: 16px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+#show_more_categories_ {
+  cursor: default;
+}
+#more_categories_toggle:checked ~ #more_categories,
+#more_categories_toggle_[checked] ~ #more_categories {
+  display: flex;
+}
+#more_categories_toggle:checked ~ #show_more_categories,
+#more_categories_toggle_[checked] ~ #show_more_categories {
+  display: none;
+}
+#more_categories_toggle:checked ~ #show_less_categories,
+#more_categories_toggle_[checked] ~ #show_less_categories {
+  display: initial;
+}
+#more_categories_toggle:not(:checked) ~ #more_categories,
+#more_categories_toggle_:not([checked]) ~ #more_categories {
+  display: none;
+}
+#more_categories_toggle:not(:checked) ~ #show_more_categories,
+#more_categories_toggle_:not([checked]) ~ #show_more_categories {
+  display: initial;
+}
+#more_categories_toggle:not(:checked) ~ #show_less_categories,
+#more_categories_toggle_:not([checked]) ~ #show_less_categories {
+  display: none;
+}
+@media screen and (max-width: 600px) {
+  #search_form #search_params {
+    overflow-x: scroll;
+  }
+  #search_form #search_params #time_and_lang {
+    display: flex;
+    margin-left: 32px;
+  }
+  #search_form #search_params #time_and_lang > * {
+    width: auto;
+  }
+  #search_form #search_params,
+  #search_form #categories {
+    flex-wrap: nowrap;
+  }
+  #search_form #more_categories {
+    margin-left: 24px;
+    padding: 8px 16px;
+    border-radius: 16px;
+    position: relative;
+    flex-direction: row;
+    align-items: center;
+    top: 0;
+    margin-left: 16px;
+  }
+  #search_form #more_categories > label {
+    padding: 0;
+  }
+  #search_form #more_categories > label:not(:last-child) {
+    margin-right: 16px;
+  }
+  #search_form.inline-search > #search_input_container {
+    margin-right: 40px;
+  }
+  .tt-dropdown-menu {
+    padding-left: 16px;
+  }
+}
+#results {
+  margin-top: 32px;
+  margin-bottom: 32px;
+}
+.result .result-template {
+  font-weight: bold;
+  text-transform: uppercase;
+  color: rgba(0, 0, 0, 0.4);
+}
+.result .result-template + .result_header {
+  margin-top: 0;
+}
+.result .result_header {
+  margin-bottom: 6px;
+}
+.result .result_header .favicon {
+  width: 16px;
+  height: 16px;
+}
+.result .subheader > :not(:last-child),
+.result .subheader > * > :not(:last-child) {
+  margin-right: 16px;
+}
+.result .result-content {
+  margin-top: 8px;
+  margin-bottom: 6px;
+}
+.result .result-content p,
+.result .result-content pre {
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
+.result.result-torrent .extra-info > :not(:last-child) {
+  margin-right: 16px;
+}
+.videos-gallery .result.result-torrent .torrent-banner {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  color: rgba(0, 0, 0, 0.4);
+  font-weight: bold;
+  padding: 6px 16px;
+  text-transform: uppercase;
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+}
+.videos-gallery .result.result-torrent .torrent-banner .torrent-data {
+  text-transform: none;
+  font-weight: normal;
+}
+.videos-gallery .result.result-torrent .torrent-banner .torrent-data > :not(:first-child) {
+  margin-left: 6px;
+}
+.result.result-videos,
+.videos-gallery .result.result-torrent {
+  position: relative;
+  border: 2px solid rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+}
+.result.result-videos .result-content,
+.videos-gallery .result.result-torrent .result-content {
+  margin: 0px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.result.result-videos .result-content .result_header,
+.videos-gallery .result.result-torrent .result-content .result_header {
+  margin-top: 0;
+}
+.result.result-videos .result-content .result_header a,
+.videos-gallery .result.result-torrent .result-content .result_header a {
+  word-wrap: break-word;
+}
+.result.result-videos .result-content > .thumbnail,
+.videos-gallery .result.result-torrent .result-content > .thumbnail {
+  position: relative;
+}
+.result.result-videos .result-content > :not(.thumbnail),
+.videos-gallery .result.result-torrent .result-content > :not(.thumbnail) {
+  margin-top: 8px;
+  height: 100%;
+  display: flex;
+  padding: 8px 16px;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.result.result-videos .result-content .thumbnail > img,
+.videos-gallery .result.result-torrent .result-content .thumbnail > img {
+  width: 100%;
+  height: 144px;
+  object-fit: cover;
+  object-position: center;
+  display: block;
+}
+.result.result-videos .result-content .subheader .result_engine,
+.videos-gallery .result.result-torrent .result-content .subheader .result_engine {
+  float: right;
+}
+.result.result-videos .result-content .subheader .result_engine img,
+.videos-gallery .result.result-torrent .result-content .subheader .result_engine img {
+  width: 16px;
+  height: 16px;
+  margin-left: 8px;
+  vertical-align: middle;
+}
+.result .external-link {
+  font-size: 14px;
+  color: #39a441;
+}
+.result .extra-info {
+  color: rgba(0, 0, 0, 0.4);
+}
+.result .code-block {
+  background-color: rgba(0, 0, 0, 0.03);
+  padding: 0 16px;
+  border-radius: 8px;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+}
+.result .code-block pre {
+  white-space: pre-wrap;
+}
+.result.result-default,
+.result.result-torrent {
+  margin-bottom: 32px;
+}
+.result.result-images {
+  display: inline;
+}
+.result.result-images .img-thumbnail {
+  width: 100%;
+  border: none;
+  margin-bottom: 8px;
+}
+#results.images-gallery {
+  display: flex;
+  flex-wrap: wrap;
+}
+#results.images-gallery .result.result-images {
+  display: block;
+  flex: 20%;
+  height: 200px;
+  max-height: 200px;
+  overflow: hidden;
+}
+.videos-gallery {
+  display: flex;
+  flex-wrap: wrap;
+}
+.videos-gallery .result.result-torrent {
+  margin-bottom: 0;
+}
+@supports (display: grid) {
+  #results.images-gallery {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+    grid-gap: 8px;
+  }
+  #results.images-gallery .result.result-images {
+    display: block;
+    text-align: center;
+    overflow: hidden;
+  }
+  #results.images-gallery .result.result-images .img-thumbnail {
+    height: 100%;
+    width: auto;
+  }
+  .videos-gallery {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(256px, 1fr));
+    grid-gap: 16px;
+  }
+  .videos-gallery .result.result-videos,
+  .videos-gallery .result.result-torrent {
+    display: block;
+    overflow: hidden;
+  }
+}
+#default_images_container {
+  column-count: 5;
+  column-gap: 8px;
+  margin-bottom: 32px;
+}
+#default_images_container .img-thumb-link {
+  display: block;
+  max-height: 120px;
+  overflow: hidden;
+}
+#suggestions form,
+#corrections form {
+  display: inline-block;
+}
+#suggestions form .btn,
+#corrections form .btn {
+  text-transform: none;
+}
+.infobox {
+  margin-top: 32px;
+}
+.infobox .head .title {
+  font-size: 22px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.infobox .head small {
+  color: rgba(0, 0, 0, 0.4);
+}
+.infobox .body .image-container {
+  max-height: 250px;
+  overflow: hidden;
+  text-align: center;
+}
+.infobox .body .content {
+  flex: 3;
+}
+.infobox .body img {
+  max-width: 100%;
+  width: 100%;
+  margin-top: 16px;
+}
+.infobox .footer .links a {
+  padding-left: 0;
+  padding-top: 0;
+  padding-bottom: 16px;
+  padding-right: 32px;
+  display: inline-block;
+  font-size: 14px;
+}
+.infobox table {
+  margin-top: 16px;
+  width: 100%;
+}
+.infobox table tr {
+  vertical-align: top;
+}
+.infobox table tr td {
+  padding: 0;
+  padding-bottom: 8px;
+}
+.infobox table tr > .label {
+  text-align: right;
+  color: rgba(0, 0, 0, 0.4);
+  padding-right: 16px;
+}
+.first-page-media-results {
+  margin-bottom: 32px;
+}
+.first-page-media-results .header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.first-page-media-results .header .title {
+  font-size: 18px;
+}
+@media screen and (max-width: 1100px) {
+  #results.images-gallery {
+    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+  }
+  #results.images-gallery .result.result-images {
+    height: 140px;
+    max-height: 140px;
+  }
+}
+#preferences h1,
+#preferences .nav-tabs,
+#preferences #notice {
+  margin-bottom: 24px;
+}
+#preferences .options {
+  margin-top: 24px;
+}
+#preferences .tab-content {
+  margin-bottom: 48px;
+  display: none;
+}
+#preferences input.tab-radio[type="radio"] {
+  display: none;
+}
+#preferences input.tab-radio[type="radio"]:checked + .tab-content {
+  display: block;
+}
+#preferences .preference {
+  margin-bottom: 16px;
+}
+#preferences .preference.inline {
+  justify-content: space-between;
+}
+#preferences .preference.inline > :first-child {
+  flex: 2;
+}
+#preferences .preference.inline > :last-child {
+  flex: 1;
+}
+#preferences #tabs {
+  margin-bottom: 32px;
+}
+#preferences #tabs > * {
+  margin-right: 32px;
+}
+#preferences #controls {
+  display: flex;
+  flex-direction: column-reverse;
+  justify-content: flex-end;
+}
+#preferences #cookies_list .cookie-value {
+  word-wrap: break-word;
+}
+#preferences #action_buttons {
+  margin-top: 48px;
+}
+#preferences #action_buttons > div {
+  margin-bottom: 24px;
+}
+#preferences #action_buttons > div > * {
+  margin-bottom: 8px;
+}
+#preferences #engines h3 {
+  text-transform: capitalize;
+  margin-top: 0;
+}
+#preferences #engines .engine {
+  display: flex;
+  margin-bottom: 8px;
+}
+#preferences #engines .engine .data {
+  width: 100%;
+  margin-left: 16px;
+  margin-right: 16px;
+}
+#preferences #engines .engine input:checked ~ .data .danger {
+  display: inline;
+}
+#preferences #engines .engine input:not(:checked) ~ .data i.danger {
+  display: none;
+}
+@media screen and (max-width: 600px) {
+  .preference.inline {
+    flex-direction: column;
+  }
+  .preference.inline > :first-child {
+    margin-bottom: 8px;
+  }
+}
+.highlight .lineno,
+.highlighttable .lineno {
+  margin-right: 16px;
+  color: rgba(0, 0, 0, 0.4);
+  display: none;
+}
diff --git a/searx/static/themes/eelo/css/eelo.min.css b/searx/static/themes/eelo/css/eelo.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..9af15d3584b88d92bf6fbc08e426c18654cd8a0c
Binary files /dev/null and b/searx/static/themes/eelo/css/eelo.min.css differ
diff --git a/searx/static/themes/eelo/css/leaflet.min.css b/searx/static/themes/eelo/css/leaflet.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..bca0c58b9a6b4aeb77b2366cacb5e2893e6f8889
Binary files /dev/null and b/searx/static/themes/eelo/css/leaflet.min.css differ
diff --git a/searx/static/themes/eelo/gruntfile.js b/searx/static/themes/eelo/gruntfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..1caaba90f0ec20783390263cafcb5b73c0a65e7c
--- /dev/null
+++ b/searx/static/themes/eelo/gruntfile.js
@@ -0,0 +1,92 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    concat: {
+      options: {
+        separator: ';'
+      },
+      dist: {
+        src: ['js/searx_src/*.js'],
+        dest: 'js/searx.js'
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! eelo/searx.min.js | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
+      },
+      dist: {
+        files: {
+          'js/searx.min.js': ['<%= concat.dist.dest %>']
+        }
+      }
+    },
+    jshint: {
+      files: ['gruntfile.js', 'js/searx_src/*.js'],
+      options: {
+        reporterOutput: "",	    
+        // options here to override JSHint defaults
+        globals: {
+          jQuery: true,
+          console: true,
+          module: true,
+          document: true
+        }
+      }
+    },
+    less: {
+        development: {
+            options: {
+                paths: ["less/eelo"]
+                //banner: '/*! less/eelo/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
+            },
+            files: {"css/eelo.css": "less/eelo/eelo.less"}
+        },
+        production: {
+            options: {
+                paths: ["less/eelo"],
+                //banner: '/*! less/eelo/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n',
+                cleancss: true
+            },
+            files: {"css/eelo.min.css": "less/eelo/eelo.less"}
+        },
+        /*
+	// built with ./manage.sh styles
+        bootstrap: {
+            options: {
+                paths: ["less/bootstrap"],
+                cleancss: true
+            },
+            files: {"css/bootstrap.min.css": "less/bootstrap/bootstrap.less"}
+        },
+        */
+    },
+    watch: {
+        scripts: {
+            files: ['<%= jshint.files %>'],
+            tasks: ['jshint', 'concat', 'uglify']
+        },
+        eelo_styles: {
+            files: ['less/eelo/**/*.less'],
+            tasks: ['less:development', 'less:production']
+        },
+        bootstrap_styles: {
+            files: ['less/bootstrap/**/*.less'],
+            tasks: ['less:bootstrap']
+        }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-less');
+
+  grunt.registerTask('test', ['jshint']);
+
+  grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
+  
+  grunt.registerTask('styles', ['less']);
+
+};
diff --git a/searx/static/themes/eelo/img/empty_space.svg b/searx/static/themes/eelo/img/empty_space.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9f25469d863bc7ff0445e5c3a520c62f2bf9a4ac
Binary files /dev/null and b/searx/static/themes/eelo/img/empty_space.svg differ
diff --git a/searx/static/themes/eelo/img/favicon.png b/searx/static/themes/eelo/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e96a90efdfb53f6de81922e93d0118d674a720
Binary files /dev/null and b/searx/static/themes/eelo/img/favicon.png differ
diff --git a/searx/static/themes/eelo/img/icons/1337x.png b/searx/static/themes/eelo/img/icons/1337x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9164d454ad4439073edbd1a0434deb78276efd2
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/1337x.png differ
diff --git a/searx/static/themes/eelo/img/icons/README.md b/searx/static/themes/eelo/img/icons/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0e3ad1c03d5d582cdadddc89dda76e241e2a9fdd
--- /dev/null
+++ b/searx/static/themes/eelo/img/icons/README.md
@@ -0,0 +1,2 @@
+Source: http://www.iconspedia.com/pack/flat-gradient-social-icons-4384/
+License: Free for non commercial use.
diff --git a/searx/static/themes/eelo/img/icons/amazon.png b/searx/static/themes/eelo/img/icons/amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4abf7d815518227d114d7edf75965c6e5a543cc
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/amazon.png differ
diff --git a/searx/static/themes/eelo/img/icons/dailymotion.png b/searx/static/themes/eelo/img/icons/dailymotion.png
new file mode 100644
index 0000000000000000000000000000000000000000..88e4801b6637c1647ba13bc2ff49dacdf2d914d2
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/dailymotion.png differ
diff --git a/searx/static/themes/eelo/img/icons/deviantart.png b/searx/static/themes/eelo/img/icons/deviantart.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec53bcea1c8aae035de4b9d9a914bb60abd7228
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/deviantart.png differ
diff --git a/searx/static/themes/eelo/img/icons/facebook.png b/searx/static/themes/eelo/img/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac5a5949359aed0775058fa583d3f7eea88ce4fc
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/facebook.png differ
diff --git a/searx/static/themes/eelo/img/icons/flickr.png b/searx/static/themes/eelo/img/icons/flickr.png
new file mode 100644
index 0000000000000000000000000000000000000000..2496313adb2a88a9087e09f9d59107087f3db766
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/flickr.png differ
diff --git a/searx/static/themes/eelo/img/icons/github.png b/searx/static/themes/eelo/img/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..9463a828a6d8ee61295af42863d6937b8f062005
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/github.png differ
diff --git a/searx/static/themes/eelo/img/icons/kickass.png b/searx/static/themes/eelo/img/icons/kickass.png
new file mode 100644
index 0000000000000000000000000000000000000000..567d1039ff8e74b4ef68634cf5d04d80f271aa0d
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/kickass.png differ
diff --git a/searx/static/themes/eelo/img/icons/openstreetmap.png b/searx/static/themes/eelo/img/icons/openstreetmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f88c9643e20555b94bb33f37a747e736d18393d
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/openstreetmap.png differ
diff --git a/searx/static/themes/eelo/img/icons/photon.png b/searx/static/themes/eelo/img/icons/photon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d073202732c490d9081fdacde3d035c6aeac78c
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/photon.png differ
diff --git a/searx/static/themes/eelo/img/icons/searchcode code.png b/searx/static/themes/eelo/img/icons/searchcode code.png
new file mode 100644
index 0000000000000000000000000000000000000000..517434af0228ed7f0c39ca1a914504e181c0d1e7
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/searchcode code.png differ
diff --git a/searx/static/themes/eelo/img/icons/searchcode doc.png b/searx/static/themes/eelo/img/icons/searchcode doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..517434af0228ed7f0c39ca1a914504e181c0d1e7
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/searchcode doc.png differ
diff --git a/searx/static/themes/eelo/img/icons/soundcloud.png b/searx/static/themes/eelo/img/icons/soundcloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..851efdd35c2f7a261e5565bfd35f2750645151c5
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/soundcloud.png differ
diff --git a/searx/static/themes/eelo/img/icons/stackoverflow.png b/searx/static/themes/eelo/img/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..812176ad228b0f7fcea1473ed030c3e0c2d2ff2f
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/stackoverflow.png differ
diff --git a/searx/static/themes/eelo/img/icons/twitter.png b/searx/static/themes/eelo/img/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..f71c1973aae899651c91c0041332a9c2d43631c3
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/twitter.png differ
diff --git a/searx/static/themes/eelo/img/icons/vimeo.png b/searx/static/themes/eelo/img/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0238d24d2487a0931f26da64aec2fceacaa0718c
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/vimeo.png differ
diff --git a/searx/static/themes/eelo/img/icons/wikipedia.png b/searx/static/themes/eelo/img/icons/wikipedia.png
new file mode 100644
index 0000000000000000000000000000000000000000..844bd57533c84ad9eb89af8e24f63eee3db2ac18
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/wikipedia.png differ
diff --git a/searx/static/themes/eelo/img/icons/youtube.png b/searx/static/themes/eelo/img/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..eee45df25b79c6c2a072bc0e84863016edaed52d
Binary files /dev/null and b/searx/static/themes/eelo/img/icons/youtube.png differ
diff --git a/searx/static/themes/eelo/img/loader.gif b/searx/static/themes/eelo/img/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..419cdeedaba815759c4a4ea3a2236fd0df0ce442
Binary files /dev/null and b/searx/static/themes/eelo/img/loader.gif differ
diff --git a/searx/static/themes/eelo/img/logo.png b/searx/static/themes/eelo/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea77c983dc5bac782ad3a7aa81de13178bc59671
Binary files /dev/null and b/searx/static/themes/eelo/img/logo.png differ
diff --git a/searx/static/themes/eelo/img/logo.svg b/searx/static/themes/eelo/img/logo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1945ee35b3d3b0c0ff5aaa4b410cd949002e08d0
Binary files /dev/null and b/searx/static/themes/eelo/img/logo.svg differ
diff --git a/searx/static/themes/eelo/img/logo_searx_a.png b/searx/static/themes/eelo/img/logo_searx_a.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f5d83f82262cfe59f7a48964149ebd973ad589c
Binary files /dev/null and b/searx/static/themes/eelo/img/logo_searx_a.png differ
diff --git a/searx/static/themes/eelo/img/logo_searx_a_n.png b/searx/static/themes/eelo/img/logo_searx_a_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b24aea8c495cc7d87dd234b7f34c6c0579d7842
Binary files /dev/null and b/searx/static/themes/eelo/img/logo_searx_a_n.png differ
diff --git a/searx/static/themes/eelo/img/map/layers-2x.png b/searx/static/themes/eelo/img/map/layers-2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b30da678eb4b0676594e9147f5c1fba023f29e7
Binary files /dev/null and b/searx/static/themes/eelo/img/map/layers-2x.png differ
diff --git a/searx/static/themes/eelo/img/map/layers.png b/searx/static/themes/eelo/img/map/layers.png
new file mode 100644
index 0000000000000000000000000000000000000000..4297fd9ee035ce8063e91e34c6e6629c4c2b22b8
Binary files /dev/null and b/searx/static/themes/eelo/img/map/layers.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-2x-green.png b/searx/static/themes/eelo/img/map/marker-icon-2x-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..7446bb031c89e6332c17133db99b3c14552ca237
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-2x-green.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-2x-orange.png b/searx/static/themes/eelo/img/map/marker-icon-2x-orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecd67736fe031549ddcc56a998402178770d0f0e
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-2x-orange.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-2x-red.png b/searx/static/themes/eelo/img/map/marker-icon-2x-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d2e197c645f015344f6471c90b8cbd68b0608d7
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-2x-red.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-2x.png b/searx/static/themes/eelo/img/map/marker-icon-2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0015b6495fa458ad39d51cb4b913430016f48d33
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-2x.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-green.png b/searx/static/themes/eelo/img/map/marker-icon-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..f48ef41df0a84632da8c7f67c8125d006e9a7ef9
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-green.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-orange.png b/searx/static/themes/eelo/img/map/marker-icon-orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0d22205c4a0e074a9f8da3e0151a334017751bd
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-orange.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon-red.png b/searx/static/themes/eelo/img/map/marker-icon-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a92b9e04b73a3c5ca0c6fd09596f96c3a36b4d7
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon-red.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-icon.png b/searx/static/themes/eelo/img/map/marker-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2e9f757f515ded172e6f72c3ce55bbe15579649
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-icon.png differ
diff --git a/searx/static/themes/eelo/img/map/marker-shadow.png b/searx/static/themes/eelo/img/map/marker-shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e773c715a9b508ebea055c4bb4b0a2ad7f6e52
Binary files /dev/null and b/searx/static/themes/eelo/img/map/marker-shadow.png differ
diff --git a/searx/static/themes/eelo/img/not_found.svg b/searx/static/themes/eelo/img/not_found.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c1954608446eb1b2b9d74e831450a46dc572c67a
Binary files /dev/null and b/searx/static/themes/eelo/img/not_found.svg differ
diff --git a/searx/static/themes/eelo/img/searx_logo.png b/searx/static/themes/eelo/img/searx_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..307b42f12ebd486109108bbc8f26cbd1d53c786b
Binary files /dev/null and b/searx/static/themes/eelo/img/searx_logo.png differ
diff --git a/searx/static/themes/eelo/img/torrent_thumb.svg b/searx/static/themes/eelo/img/torrent_thumb.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7575287a20312902f71e101bde4f75948ac854a4
Binary files /dev/null and b/searx/static/themes/eelo/img/torrent_thumb.svg differ
diff --git a/searx/static/themes/eelo/js/leaflet-0.7.3.min.js b/searx/static/themes/eelo/js/leaflet-0.7.3.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..03434b77db782fc44004ad77d160f2f17edf99ff
Binary files /dev/null and b/searx/static/themes/eelo/js/leaflet-0.7.3.min.js differ
diff --git a/searx/static/themes/eelo/js/searx.js b/searx/static/themes/eelo/js/searx.js
new file mode 100644
index 0000000000000000000000000000000000000000..310d2a292f6bcd57ef79aac9f86cd5385caef441
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx.js
@@ -0,0 +1,353 @@
+/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+requirejs.config({
+    baseUrl: './static/themes/oscar/js',
+    paths: {
+        app: '../app'
+    }
+});
+;/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+if(searx.autocompleter) {
+    searx.searchResults = new Bloodhound({
+        datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
+        remote: './autocompleter?q=%QUERY'
+    });
+    searx.searchResults.initialize();
+}
+
+$(document).ready(function() {
+    if(searx.autocompleter) {
+        $('#q').typeahead(null, {
+            name: 'search-results',
+            displayKey: function(result) {
+                return result;
+            },
+            source: searx.searchResults.ttAdapter()
+        });
+
+        $('#q').bind('typeahead:selected', function(ev) {
+            $("#search_form").submit();
+        });
+    }
+});
+;
+function configure_image_view(target) {
+  document.getElementById("image_view_image").src = target.href;
+  document.getElementById("image_view_file_link").href = target.href;
+  document.getElementById("image_view_url_link").href = target.dataset.url;
+}
+
+function show_image_view_modal(event) {
+  event.preventDefault();
+  var target = event.target;
+  if (target.tagName == "IMG") {
+      target = target.parentElement;
+  }
+
+  var modal = document.getElementById("image_view_modal");
+  modal.classList.remove("hidden");
+  modal.style.top = window.scrollY + "px";
+  configure_image_view(target);
+  document.body.classList.add("lock");
+}
+
+function close_image_view_modal() {
+  document.getElementById("image_view_modal").classList.add("hidden");
+  document.getElementById("image_view_image").src = "";
+  document.getElementById("image_view_file_link").href = "#";
+  document.getElementById("image_view_url_link").href = "#";
+  document.body.classList.remove("lock");
+};/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+$(document).ready(function() {
+    /**
+     * focus element if class="autofocus" and id="q"
+     */
+    // document.querySelector("#q[autofocus]").focus();
+    $('#q[autofocus]').focus();
+
+    /**
+     * select full content on click if class="select-all-on-click"
+     */
+    $(".select-all-on-click").click(function () {
+        $(this).select();
+    });    
+
+    /**
+     * change text during btn-collapse click if possible
+     */
+    $('.btn-collapse').click(function() {
+        var btnTextCollapsed = $(this).data('btn-text-collapsed');
+        var btnTextNotCollapsed = $(this).data('btn-text-not-collapsed');
+        
+        if(btnTextCollapsed !== '' && btnTextNotCollapsed !== '') {
+            if($(this).hasClass('collapsed')) {
+                new_html = $(this).html().replace(btnTextCollapsed, btnTextNotCollapsed);
+            } else {
+                new_html = $(this).html().replace(btnTextNotCollapsed, btnTextCollapsed);
+            }
+            $(this).html(new_html);
+        }
+    });
+
+    /**
+     * change text during btn-toggle click if possible
+     */
+    $('.btn-toggle .btn').click(function() {
+        var btnClass = 'btn-' + $(this).data('btn-class');
+        var btnLabelDefault = $(this).data('btn-label-default');
+        var btnLabelToggled = $(this).data('btn-label-toggled');
+        if(btnLabelToggled !== '') {
+            if($(this).hasClass('btn-default')) {
+                new_html = $(this).html().replace(btnLabelDefault, btnLabelToggled);
+            } else {
+                new_html = $(this).html().replace(btnLabelToggled, btnLabelDefault);
+            }
+            $(this).html(new_html);
+        }
+        $(this).toggleClass(btnClass);
+        $(this).toggleClass('btn-default');
+    });
+	
+	/**
+     * change text during btn-toggle click if possible
+     */
+    $('.media-loader').click(function() {
+        var target = $(this).data('target');
+        var iframe_load = $(target + ' > iframe');
+        var srctest = iframe_load.attr('src');
+        if(srctest === undefined || srctest === false){
+            iframe_load.attr('src', iframe_load.data('src'));
+        }
+    });
+
+
+    // kinda hack, to make the more categories menu work, when JS is enabled.
+    $("#show_more_categories_").click(function(event) {
+        $(event.target).addClass("hidden");
+        $("#show_less_categories_").removeClass("hidden");
+        $("#more_categories_toggle_").attr("checked", true);
+    });
+    $("#show_less_categories_").click(function(event) {
+        $(event.target).addClass("hidden");
+        $("#show_more_categories_").removeClass("hidden");
+        $("#more_categories_toggle_").attr("checked", false);
+    });
+    $("#show_more_categories_").removeClass("hidden");
+    $('<div id="more_categories_toggle_" class="hidden"></div>').insertAfter($("#more_categories_toggle"));
+    $("#more_categories_toggle, #show_more_categories, #show_less_categories").remove();
+});
+;/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+$(document).ready(function(){
+    $(".searx_overpass_request").on( "click", function( event ) {
+        var overpass_url = "https://overpass-api.de/api/interpreter?data=";
+        var query_start = overpass_url + "[out:json][timeout:25];(";
+        var query_end = ");out meta;";
+        
+        var osm_id = $(this).data('osm-id');
+        var osm_type = $(this).data('osm-type');
+        var result_table = $(this).data('result-table');
+        var result_table_loadicon = "#" + $(this).data('result-table-loadicon');
+        
+        // tags which can be ignored
+        var osm_ignore_tags = [ "addr:city", "addr:country", "addr:housenumber", "addr:postcode", "addr:street" ];
+        
+        if(osm_id && osm_type && result_table) {
+            result_table = "#" + result_table;
+            var query = null;
+            switch(osm_type) {
+                case 'node':
+                    query = query_start + "node(" + osm_id + ");" + query_end;
+                    break;
+                case 'way':
+                    query = query_start + "way(" + osm_id + ");" + query_end;
+                    break;
+                case 'relation':
+                    query = query_start + "relation(" + osm_id + ");" + query_end;
+                    break;
+                default:
+                    break;
+            }
+            if(query) {
+                //alert(query);
+                var ajaxRequest = $.ajax( query )
+                .done(function( html) {
+                    if(html && html.elements && html.elements[0]) {
+                        var element = html.elements[0];
+                        var newHtml = $(result_table).html();
+                        for (var row in element.tags) {
+                            if(element.tags.name === null || osm_ignore_tags.indexOf(row) == -1) {
+                                newHtml += "<tr><td>" + row + "</td><td>";
+                                switch(row) {
+                                    case "phone":
+                                    case "fax":
+                                        newHtml += "<a href=\"tel:" + element.tags[row].replace(/ /g,'') + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "email":
+                                        newHtml += "<a href=\"mailto:" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "website":
+                                    case "url":
+                                        newHtml += "<a href=\"" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikidata":
+                                        newHtml += "<a href=\"https://www.wikidata.org/wiki/" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikipedia":
+                                        if(element.tags[row].indexOf(":") != -1) {
+                                            newHtml += "<a href=\"https://" + element.tags[row].substring(0,element.tags[row].indexOf(":")) + ".wikipedia.org/wiki/" + element.tags[row].substring(element.tags[row].indexOf(":")+1) + "\">" + element.tags[row] + "</a>";
+                                            break;
+                                        }
+                                    /* jshint ignore:start */
+                                    default:
+                                    /* jshint ignore:end */
+                                        newHtml += element.tags[row];
+                                        break;
+                                }
+                                newHtml += "</td></tr>";
+                            }
+                        }
+                        $(result_table).html(newHtml);
+                        $(result_table).removeClass('hidden');
+                        $(result_table_loadicon).addClass('hidden');
+                    }
+                })
+                .fail(function() {
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");
+                });
+            }
+        }
+
+        // this event occour only once per element
+        $( this ).off( event );    
+    });
+
+    $(".searx_init_map").on( "click", function( event ) {
+        var leaflet_target = $(this).data('leaflet-target');
+        var map_lon = $(this).data('map-lon');
+        var map_lat = $(this).data('map-lat');
+        var map_zoom = $(this).data('map-zoom');
+        var map_boundingbox = $(this).data('map-boundingbox');
+        var map_geojson = $(this).data('map-geojson');
+
+        require(['leaflet-0.7.3.min'], function(leaflet) {
+            if(map_boundingbox) {
+                southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]);
+                northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]);
+                map_bounds = L.latLngBounds(southWest, northEast);
+            }
+
+            // TODO hack
+            // change default imagePath
+            L.Icon.Default.imagePath = 	"./static/themes/oscar/img/map";
+
+            // init map
+            var map = L.map(leaflet_target);
+
+            // create the tile layer with correct attribution
+	    var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+	    var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
+
+	    var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
+	    var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
+
+            // init map view
+            if(map_bounds) {
+                // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021
+                setTimeout(function () {
+                    map.fitBounds(map_bounds, {
+                        maxZoom:17
+                    });
+                }, 0);
+            } else if (map_lon && map_lat) {
+                if(map_zoom) 
+                    map.setView(new L.LatLng(map_lat, map_lon),map_zoom);
+                else
+                    map.setView(new L.LatLng(map_lat, map_lon),8);
+            }
+
+	        map.addLayer(osmMapnik);
+	        
+	        var baseLayers = {
+             "OSM Mapnik": osmMapnik/*,
+             "OSM Wikimedia": osmWikimedia*/
+            };
+
+            L.control.layers(baseLayers).addTo(map);
+
+
+            if(map_geojson)
+                L.geoJson(map_geojson).addTo(map);
+            /*else if(map_bounds)
+                L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/
+        });
+
+        // this event occour only once per element
+        $( this ).off( event );
+    });
+});  
diff --git a/searx/static/themes/eelo/js/searx.min.js b/searx/static/themes/eelo/js/searx.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..260c635b06de222d7694bef511e7f236e90b675a
Binary files /dev/null and b/searx/static/themes/eelo/js/searx.min.js differ
diff --git a/searx/static/themes/eelo/js/searx_src/00_requirejs_config.js b/searx/static/themes/eelo/js/searx_src/00_requirejs_config.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7c2abdac09706c8ae85deb48da26ac416400500
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx_src/00_requirejs_config.js
@@ -0,0 +1,23 @@
+/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+requirejs.config({
+    baseUrl: './static/themes/oscar/js',
+    paths: {
+        app: '../app'
+    }
+});
diff --git a/searx/static/themes/eelo/js/searx_src/autocompleter.js b/searx/static/themes/eelo/js/searx_src/autocompleter.js
new file mode 100644
index 0000000000000000000000000000000000000000..6837a0c675802af194e38dd2da873fc85da16a73
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx_src/autocompleter.js
@@ -0,0 +1,41 @@
+/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+if(searx.autocompleter) {
+    searx.searchResults = new Bloodhound({
+        datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
+        remote: './autocompleter?q=%QUERY'
+    });
+    searx.searchResults.initialize();
+}
+
+$(document).ready(function() {
+    if(searx.autocompleter) {
+        $('#q').typeahead(null, {
+            name: 'search-results',
+            displayKey: function(result) {
+                return result;
+            },
+            source: searx.searchResults.ttAdapter()
+        });
+
+        $('#q').bind('typeahead:selected', function(ev) {
+            $("#search_form").submit();
+        });
+    }
+});
diff --git a/searx/static/themes/eelo/js/searx_src/custom.js b/searx/static/themes/eelo/js/searx_src/custom.js
new file mode 100644
index 0000000000000000000000000000000000000000..848300231bf61937934a6108eeee8add263a1364
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx_src/custom.js
@@ -0,0 +1,28 @@
+
+function configure_image_view(target) {
+  document.getElementById("image_view_image").src = target.href;
+  document.getElementById("image_view_file_link").href = target.href;
+  document.getElementById("image_view_url_link").href = target.dataset.url;
+}
+
+function show_image_view_modal(event) {
+  event.preventDefault();
+  var target = event.target;
+  if (target.tagName == "IMG") {
+      target = target.parentElement;
+  }
+
+  var modal = document.getElementById("image_view_modal");
+  modal.classList.remove("hidden");
+  modal.style.top = window.scrollY + "px";
+  configure_image_view(target);
+  document.body.classList.add("lock");
+}
+
+function close_image_view_modal() {
+  document.getElementById("image_view_modal").classList.add("hidden");
+  document.getElementById("image_view_image").src = "";
+  document.getElementById("image_view_file_link").href = "#";
+  document.getElementById("image_view_url_link").href = "#";
+  document.body.classList.remove("lock");
+}
\ No newline at end of file
diff --git a/searx/static/themes/eelo/js/searx_src/element_modifiers.js b/searx/static/themes/eelo/js/searx_src/element_modifiers.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f15b641572457a56fa3ac033211e83a171353aa
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx_src/element_modifiers.js
@@ -0,0 +1,95 @@
+/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+$(document).ready(function() {
+    /**
+     * focus element if class="autofocus" and id="q"
+     */
+    // document.querySelector("#q[autofocus]").focus();
+    $('#q[autofocus]').focus();
+
+    /**
+     * select full content on click if class="select-all-on-click"
+     */
+    $(".select-all-on-click").click(function () {
+        $(this).select();
+    });    
+
+    /**
+     * change text during btn-collapse click if possible
+     */
+    $('.btn-collapse').click(function() {
+        var btnTextCollapsed = $(this).data('btn-text-collapsed');
+        var btnTextNotCollapsed = $(this).data('btn-text-not-collapsed');
+        
+        if(btnTextCollapsed !== '' && btnTextNotCollapsed !== '') {
+            if($(this).hasClass('collapsed')) {
+                new_html = $(this).html().replace(btnTextCollapsed, btnTextNotCollapsed);
+            } else {
+                new_html = $(this).html().replace(btnTextNotCollapsed, btnTextCollapsed);
+            }
+            $(this).html(new_html);
+        }
+    });
+
+    /**
+     * change text during btn-toggle click if possible
+     */
+    $('.btn-toggle .btn').click(function() {
+        var btnClass = 'btn-' + $(this).data('btn-class');
+        var btnLabelDefault = $(this).data('btn-label-default');
+        var btnLabelToggled = $(this).data('btn-label-toggled');
+        if(btnLabelToggled !== '') {
+            if($(this).hasClass('btn-default')) {
+                new_html = $(this).html().replace(btnLabelDefault, btnLabelToggled);
+            } else {
+                new_html = $(this).html().replace(btnLabelToggled, btnLabelDefault);
+            }
+            $(this).html(new_html);
+        }
+        $(this).toggleClass(btnClass);
+        $(this).toggleClass('btn-default');
+    });
+	
+	/**
+     * change text during btn-toggle click if possible
+     */
+    $('.media-loader').click(function() {
+        var target = $(this).data('target');
+        var iframe_load = $(target + ' > iframe');
+        var srctest = iframe_load.attr('src');
+        if(srctest === undefined || srctest === false){
+            iframe_load.attr('src', iframe_load.data('src'));
+        }
+    });
+
+
+    // kinda hack, to make the more categories menu work, when JS is enabled.
+    $("#show_more_categories_").click(function(event) {
+        $(event.target).addClass("hidden");
+        $("#show_less_categories_").removeClass("hidden");
+        $("#more_categories_toggle_").attr("checked", true);
+    });
+    $("#show_less_categories_").click(function(event) {
+        $(event.target).addClass("hidden");
+        $("#show_more_categories_").removeClass("hidden");
+        $("#more_categories_toggle_").attr("checked", false);
+    });
+    $("#show_more_categories_").removeClass("hidden");
+    $('<div id="more_categories_toggle_" class="hidden"></div>').insertAfter($("#more_categories_toggle"));
+    $("#more_categories_toggle, #show_more_categories, #show_less_categories").remove();
+});
diff --git a/searx/static/themes/eelo/js/searx_src/leaflet_map.js b/searx/static/themes/eelo/js/searx_src/leaflet_map.js
new file mode 100644
index 0000000000000000000000000000000000000000..44360433b340d042d0d79647d071ad9d697cd9f7
--- /dev/null
+++ b/searx/static/themes/eelo/js/searx_src/leaflet_map.js
@@ -0,0 +1,167 @@
+/**
+ * searx is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * searx is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.
+ *
+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>
+ */
+
+$(document).ready(function(){
+    $(".searx_overpass_request").on( "click", function( event ) {
+        var overpass_url = "https://overpass-api.de/api/interpreter?data=";
+        var query_start = overpass_url + "[out:json][timeout:25];(";
+        var query_end = ");out meta;";
+        
+        var osm_id = $(this).data('osm-id');
+        var osm_type = $(this).data('osm-type');
+        var result_table = $(this).data('result-table');
+        var result_table_loadicon = "#" + $(this).data('result-table-loadicon');
+        
+        // tags which can be ignored
+        var osm_ignore_tags = [ "addr:city", "addr:country", "addr:housenumber", "addr:postcode", "addr:street" ];
+        
+        if(osm_id && osm_type && result_table) {
+            result_table = "#" + result_table;
+            var query = null;
+            switch(osm_type) {
+                case 'node':
+                    query = query_start + "node(" + osm_id + ");" + query_end;
+                    break;
+                case 'way':
+                    query = query_start + "way(" + osm_id + ");" + query_end;
+                    break;
+                case 'relation':
+                    query = query_start + "relation(" + osm_id + ");" + query_end;
+                    break;
+                default:
+                    break;
+            }
+            if(query) {
+                //alert(query);
+                var ajaxRequest = $.ajax( query )
+                .done(function( html) {
+                    if(html && html.elements && html.elements[0]) {
+                        var element = html.elements[0];
+                        var newHtml = $(result_table).html();
+                        for (var row in element.tags) {
+                            if(element.tags.name === null || osm_ignore_tags.indexOf(row) == -1) {
+                                newHtml += "<tr><td>" + row + "</td><td>";
+                                switch(row) {
+                                    case "phone":
+                                    case "fax":
+                                        newHtml += "<a href=\"tel:" + element.tags[row].replace(/ /g,'') + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "email":
+                                        newHtml += "<a href=\"mailto:" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "website":
+                                    case "url":
+                                        newHtml += "<a href=\"" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikidata":
+                                        newHtml += "<a href=\"https://www.wikidata.org/wiki/" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikipedia":
+                                        if(element.tags[row].indexOf(":") != -1) {
+                                            newHtml += "<a href=\"https://" + element.tags[row].substring(0,element.tags[row].indexOf(":")) + ".wikipedia.org/wiki/" + element.tags[row].substring(element.tags[row].indexOf(":")+1) + "\">" + element.tags[row] + "</a>";
+                                            break;
+                                        }
+                                    /* jshint ignore:start */
+                                    default:
+                                    /* jshint ignore:end */
+                                        newHtml += element.tags[row];
+                                        break;
+                                }
+                                newHtml += "</td></tr>";
+                            }
+                        }
+                        $(result_table).html(newHtml);
+                        $(result_table).removeClass('hidden');
+                        $(result_table_loadicon).addClass('hidden');
+                    }
+                })
+                .fail(function() {
+                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");
+                });
+            }
+        }
+
+        // this event occour only once per element
+        $( this ).off( event );    
+    });
+
+    $(".searx_init_map").on( "click", function( event ) {
+        var leaflet_target = $(this).data('leaflet-target');
+        var map_lon = $(this).data('map-lon');
+        var map_lat = $(this).data('map-lat');
+        var map_zoom = $(this).data('map-zoom');
+        var map_boundingbox = $(this).data('map-boundingbox');
+        var map_geojson = $(this).data('map-geojson');
+
+        require(['leaflet-0.7.3.min'], function(leaflet) {
+            if(map_boundingbox) {
+                southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]);
+                northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]);
+                map_bounds = L.latLngBounds(southWest, northEast);
+            }
+
+            // TODO hack
+            // change default imagePath
+            L.Icon.Default.imagePath = 	"./static/themes/oscar/img/map";
+
+            // init map
+            var map = L.map(leaflet_target);
+
+            // create the tile layer with correct attribution
+	    var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+	    var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
+
+	    var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
+	    var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
+
+            // init map view
+            if(map_bounds) {
+                // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021
+                setTimeout(function () {
+                    map.fitBounds(map_bounds, {
+                        maxZoom:17
+                    });
+                }, 0);
+            } else if (map_lon && map_lat) {
+                if(map_zoom) 
+                    map.setView(new L.LatLng(map_lat, map_lon),map_zoom);
+                else
+                    map.setView(new L.LatLng(map_lat, map_lon),8);
+            }
+
+	        map.addLayer(osmMapnik);
+	        
+	        var baseLayers = {
+             "OSM Mapnik": osmMapnik/*,
+             "OSM Wikimedia": osmWikimedia*/
+            };
+
+            L.control.layers(baseLayers).addTo(map);
+
+
+            if(map_geojson)
+                L.geoJson(map_geojson).addTo(map);
+            /*else if(map_bounds)
+                L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/
+        });
+
+        // this event occour only once per element
+        $( this ).off( event );
+    });
+});  
diff --git a/searx/static/themes/eelo/less/eelo/base.less b/searx/static/themes/eelo/less/eelo/base.less
new file mode 100644
index 0000000000000000000000000000000000000000..14acfb7d0a5b1ecf75c40375af06bf4cc500266d
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/base.less
@@ -0,0 +1,133 @@
+
+html {
+  position: relative;
+  min-height: 100%;
+  color: @text-color;
+}
+
+body {
+  margin: 0px;
+  padding: 0px;
+  font-size: @fontsize_medium;
+  margin-bottom: 120px;
+  background-color: white;
+  font-family: 'Roboto', "Cantarell", Helvetica, Arial, sans-serif;
+
+  &.lock { overflow: hidden; }
+
+  * {
+    font-family: sans-serif, "Cantarell", 'Roboto', Helvetica, Arial;
+  }
+}
+
+input, select {
+  box-shadow: none !important;
+}
+
+a { 
+  color: @link-color;
+  &:extend(.color-transition);
+}
+a, select {
+  &, &:focus, &:active, &:hover {
+    outline: none;
+    text-decoration: none;
+  }
+}
+
+label { color: @text-color-hl; }
+
+section { margin-bottom: @spacing_xx-large; }
+
+ul > li { margin-bottom: @spacing_medium; }
+
+fieldset {
+  border: none;
+  padding: 0px;
+}
+
+pre {
+  font-family: 'Courier New', Courier, monospace;
+  background: @dim-color-lighter;
+  padding: @spacing_medium @spacing_large;
+  border-radius: @corner-radius;
+  white-space: pre-line;
+}
+
+
+
+footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: auto;
+  text-align: center;
+  color: #c1c1c1;
+  padding-bottom: @spacing_medium;
+
+  .links > :first-child {
+    margin-right: @spacing_medium;
+  }
+}
+
+
+
+[disabled] {
+  &:extend(.disabled);
+}
+.hidden, #icons { display: none; }
+
+
+#image_view_modal {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, .9);
+  z-index: 100;
+
+  button {
+    display: block;
+    width: 100%;
+    text-align: right;
+    background: none;
+    border: none;
+
+    .icon {
+      fill: white;
+    }
+  }
+
+  .card-container {
+    display: flex;
+    height: 100%;
+  }
+
+  #image_view_card {
+    margin: auto;
+    max-width: @size-content;
+    max-height: 80vh;
+
+    .mobile-mq({
+      margin-left: @spacing_container;
+      margin-right: @spacing_container;
+      max-width: 100%;
+      width: 100%;
+    });
+  }
+
+  #image_view_image {
+    display: block;
+    max-width: 100%;
+    max-height: 70vh;
+    background-color: white;
+    margin: auto;
+  }
+
+  .options { margin-top: @spacing_medium; }
+  .btn {
+    .btn.plain-white();
+    display: inline-block;
+    margin-right: @spacing_medium;
+  }
+}
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/code.less b/searx/static/themes/eelo/less/eelo/code.less
new file mode 100644
index 0000000000000000000000000000000000000000..d1a30e365ae61c1b6e74c6665166cbab26b00712
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/code.less
@@ -0,0 +1,11 @@
+.highlight, .highlighttable {
+  .lineno {
+    margin-right: @spacing_large;
+    color: @text-muted-color;
+    display: none;
+  }
+  .kd {}
+  .kt {}
+  .nf {}
+  .o {}
+}
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/defs.less b/searx/static/themes/eelo/less/eelo/defs.less
new file mode 100644
index 0000000000000000000000000000000000000000..5f3f210ca35a6ac8f42650ea9c5bf14d5f30a933
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/defs.less
@@ -0,0 +1,90 @@
+@black: #020f16;
+@grey: #eeeeee;
+@text-color: #60686f;
+@text-color-hl: #5c6469;
+@link-color: #1f6ed7;
+
+@color_accent: #5068dd;
+@color_accent__op: white;
+@color_accent__dark: #2344a2;
+@color_primary: blue;
+@color_base: blue;
+@color_base-text-hl: #5c6469;
+
+@color_danger: #e06572;
+@color_danger__op: white;
+
+@corner-radius: 8px;
+
+@dim-color-superlighter: rgba(0, 0, 0, 0.03);
+@dim-color-lighter: rgba(0, 0, 0, 0.1);
+@dim-color-light: rgba(0, 0, 0, 0.2);
+@dim-color-normal: rgba(0, 0, 0, 0.4);
+
+@text-muted-color: @dim-color-normal;
+
+
+@fontsize_xx-small: 8px;
+@fontsize_x-small: 11px;
+@fontsize_small: 14px;
+@fontsize_medium: 16px;
+@fontsize_large: 18px;
+@fontsize_x-large: 22px;
+@fontsize_xx-large: 22px;
+
+@spacing_xx-small: 2px;
+@spacing_x-small: 4px;
+@spacing_small: 6px;
+@spacing_medium: 8px;
+@spacing_large: 16px;
+@spacing_x-large: 24px;
+@spacing_xx-large: 32px;
+@spacing_huge: 38px;
+@spacing_x-huge: 48px;
+@spacing_xx-huge: 64px;
+
+@spacing_container: @spacing_large;
+@spacing_search_bar_contents: 56px;
+
+@size-content-small: 400px;
+@size-content: 600px;
+
+@size-desktop: 1100px;
+@size-mobile: 600px;
+
+
+.container-padding {
+  padding-left: @spacing_container;
+  padding-right: @spacing_container;
+}
+
+
+@color-transition: color .2s ease-in-out;
+@border-color-transition: border-color .2s ease-in-out;
+@background-color-transition: background-color .2s ease-in-out;
+@fill-transition: fill .2s ease-in-out;
+@box-shadow-transition: box-shadow .2s ease-in-out;
+
+.color-transition { transition: @color-transition; }
+.border-color-transition { transition: @border-color-transition; }
+.fill-transition { transition: @fill-transition; }
+.box-shadow-transition { transition: @box-shadow-transition; }
+
+.widget-border(@color: rgba(0, 0, 0, .2)) {
+  border: 2px solid @color;
+}
+
+
+.disabled { opacity: .4; }
+
+
+// media queries
+.tablet-mq(@rules) {
+  @media screen and (max-width: @size-desktop) { @rules(); }
+}
+.mobile-mq(@rules) {
+  @media screen and (max-width: @size-mobile) { @rules(); }
+}
+.mobile-landscape-mq(@rules) {
+  @media screen and (max-height: @size-mobile) and (orientation: landscape) { @rules(); }
+}
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/eelo.less b/searx/static/themes/eelo/less/eelo/eelo.less
new file mode 100644
index 0000000000000000000000000000000000000000..d22b257ec7359755440e8ee00d29fd797c3de727
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/eelo.less
@@ -0,0 +1,11 @@
+@import "defs.less";
+@import "layout.less";
+@import "widgets.less";
+
+@import "base.less";
+@import "navbar.less";
+
+@import "search.less";
+@import "results.less";
+@import "preferences.less";
+@import "code.less";
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/layout.less b/searx/static/themes/eelo/less/eelo/layout.less
new file mode 100644
index 0000000000000000000000000000000000000000..284dda45411487f7667f397c1cc6eb1899f05fe6
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/layout.less
@@ -0,0 +1,146 @@
+
+#pagination {
+  margin-top: @spacing_x-huge;
+  display: flex;
+  justify-content: space-between;
+}
+
+.container {
+  max-width: @size-desktop;
+  .container-padding();
+
+  display: flex;
+  justify-content: space-between;
+  margin: auto;
+
+  >:first-child {
+    max-width: @size-content;
+    width: @size-content;
+  }
+  >:last-child:not(:first-child) {
+    max-width: @size-content-small;
+    width: @size-content-small;
+  }
+}
+
+.container.full {
+  max-width: 100%;
+  >:first-child {
+    max-width: 100%;
+    width: 100%;
+  }
+  >:last-child:not(:first-child) {
+    display: none;
+  }
+
+  #pagination {
+    max-width: @size-content-small;
+    width: @size-content-small;
+    margin: auto;
+    justify-content: space-around;
+  }
+}
+
+#search_bar_area {
+  border-bottom: 1px solid rgba(0, 0, 0, .1);
+}
+#search_bar_area #search_form, #no_results_msg, .content-small-centered {
+  max-width: @size-content;
+  margin: auto;
+}
+#no_results_msg, #page_not_found_404 {
+  text-align: center;
+  margin-top: @spacing_xx-huge;
+  margin-bottom: @spacing_xx-huge;
+  img {
+    max-width: 70%;
+  }
+}
+#errors {
+  .widget-border(@color_danger);
+  border-radius: @corner-radius;
+  padding: @spacing_medium;
+
+  .title {
+    margin-top: 0;
+    margin-bottom: @spacing_medium;
+  }
+  pre {
+    background-color: fade(@color_danger, 10%);
+  }
+}
+
+
+.inline {
+  display: flex;
+  flex-direction: row;
+}
+
+
+.tablet-mq({
+  .container {
+    flex-direction: column-reverse;
+
+    > * { margin: auto; }
+  }
+  #preferences.container {
+    flex-direction: column;
+    margin-top: @spacing_large;
+  }
+});
+
+.mobile-mq({
+  .container {
+    max-width: 100%;
+    .container-padding();
+  
+    > :first-child, > :last-child:not(:first-child) {
+      max-width: 100%;
+      width: 100%;
+    }
+  }
+
+  main {
+    margin-top: @spacing_large;
+  }
+
+  #search_input_container {
+    margin-left: @spacing_container;
+    margin-right: @spacing_container;
+  }
+
+  .container.full #pagination {
+    max-width: 100%;
+    width: 100%;
+  }
+});
+
+
+// Move somewhere else?
+#index {
+  max-width: @size-content;
+  margin: auto;
+
+  img {
+    width: 300px;
+    display: block;
+    margin: auto;
+    margin-top: 64px;
+    margin-bottom: 64px;
+  }
+  img#logo_inline { display: none; }
+}
+.mobile-mq({
+  #index img {
+    width: 50vmin;
+    margin-bottom: @spacing_x-large;
+  }
+});
+.mobile-landscape-mq({
+  #index img {
+    width: 70vmin;
+    margin-top: @spacing_xx-large;
+    display: none; 
+  }
+  #index img#logo_inline { display: block; }
+});
diff --git a/searx/static/themes/eelo/less/eelo/navbar.less b/searx/static/themes/eelo/less/eelo/navbar.less
new file mode 100644
index 0000000000000000000000000000000000000000..63a56ea4d3d3b9bbbe3d66ff102ab2e49a00fb83
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/navbar.less
@@ -0,0 +1,73 @@
+nav {
+  &:extend(.container-padding);
+
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  text-transform: capitalize;
+
+  margin-bottom: 24px;
+  a {
+    color: #868686;
+
+    &:hover {
+      color: @color_accent;
+    }
+  }
+  #eelo_links > * { margin-right: 32px; }
+}
+#nav_toggle_btn {
+  display: none;
+}
+
+
+.mobile-mq({
+  nav {
+    position: fixed;
+    right: 0;
+    top: 0;
+    flex-direction: column;
+    height: 100%;
+    background-color: white;
+    z-index: 1000;
+    width: 280px;
+    min-width: 280px;
+    max-width: 280px;
+    align-items: unset;
+    // padding: @spacing_medium;
+    box-shadow: 0 0 0 rgba(0, 0, 0, .2);
+    transition: transform .2s ease-in-out, box-shadow .2s ease-in-out;
+    padding: 0;
+  }
+  nav > :first-child { margin-top: @spacing_large / 2; }
+  nav > :last-child { margin-bottom: @spacing_large / 2; }
+  nav a {
+    display: block;
+    padding: @spacing_large / 2 @spacing_large;
+  }
+  #nav_toggle_btn {
+    display: block;
+    position: absolute;
+    top: @spacing_medium + @spacing_large;
+    right: @spacing_medium;
+    z-index: 1001;
+  }
+  #nav_toggle:checked {
+    & ~ #nav_toggle_btn > .menu-open { display: none; }
+    & ~ #nav_toggle_btn > .menu-close { display: initial; }
+    & ~ nav {
+      box-shadow: 0 0 30px rgba(0, 0, 0, .2);
+      transform: translateX(0);
+    }
+    & ~ #nav_toggle_btn {
+      position: fixed;
+    }
+  }
+  #nav_toggle:not(:checked) {
+    & ~ #nav_toggle_btn > .menu-open { display: initial; }
+    & ~ #nav_toggle_btn > .menu-close { display: none; }
+    & ~ nav { transform: translateX(100%); }
+  }
+});
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/preferences.less b/searx/static/themes/eelo/less/eelo/preferences.less
new file mode 100644
index 0000000000000000000000000000000000000000..ba2345551d8ae44afb04e7f0b8559c744b8d8daa
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/preferences.less
@@ -0,0 +1,71 @@
+#preferences {
+  h1, .nav-tabs, #notice { margin-bottom: @spacing_x-large; }
+
+  .options { margin-top: @spacing_x-large; }
+
+  .tab-content {
+    margin-bottom: 48px;
+    display: none;
+  }
+
+  input.tab-radio[type="radio"] { display: none; }
+  input.tab-radio[type="radio"]:checked + .tab-content { display: block; }
+
+  .preference {
+    margin-bottom: @spacing_large;
+    
+    &.inline {
+      justify-content: space-between;
+      
+      >:first-child { flex: 2; }
+      >:last-child { flex: 1; }
+    }
+  }
+
+  #tabs { margin-bottom: @spacing_xx-large; }
+  #tabs > * { margin-right: @spacing_xx-large; }
+
+  #controls {
+    display: flex;
+    flex-direction: column-reverse;
+    justify-content: flex-end;
+  }
+
+  #cookies_list { }
+  #cookies_list .cookie-value { word-wrap: break-word; }
+
+  #action_buttons { margin-top: @spacing_x-huge; }
+  #action_buttons > div { margin-bottom: @spacing_x-large; }
+  #action_buttons > div > * { margin-bottom: @spacing_medium; }
+
+
+  #engines {
+    h3 {
+      text-transform: capitalize;
+      margin-top: 0;
+    }
+
+    .engine {
+      display: flex;
+      margin-bottom: @spacing_medium;
+
+      .data {
+        width: 100%;
+        margin-left: @spacing_large;
+        margin-right: @spacing_large;
+      }
+
+      input:checked ~ .data { &:extend(.disabled); }
+      input:checked ~ .data .danger { display: inline; }
+      input:not(:checked) ~ .data i.danger { display: none; }
+    }
+  }
+}
+
+.mobile-mq({
+  .preference.inline {
+    flex-direction: column;
+    
+    >:first-child { margin-bottom: @spacing_medium; }
+  }
+});
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/results.less b/searx/static/themes/eelo/less/eelo/results.less
new file mode 100644
index 0000000000000000000000000000000000000000..94afbd5baedede8b4d8c733863778f78e3cb6af2
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/results.less
@@ -0,0 +1,299 @@
+@video-scale: 16;
+
+#results {
+  margin-top: @spacing_xx-large;
+  margin-bottom: @spacing_xx-large;
+}
+
+.result {
+  .result-template {
+    font-weight: bold;
+    text-transform: uppercase;
+    color: @text-muted-color;
+
+    & + .result_header { margin-top: 0; }
+  }
+  .result_header {
+    margin-bottom: @spacing_small;
+  
+    .favicon {
+      width: 16px;
+      height: 16px;
+    }
+  }
+  .subheader > :not(:last-child), .subheader > * > :not(:last-child) {
+    margin-right: @spacing_large; 
+  }
+  .result-content {
+    margin-top: @spacing_medium;
+    margin-bottom: @spacing_small;
+
+    p, pre {
+      margin-top: @spacing_medium;
+      margin-bottom: @spacing_medium;
+    }
+  }
+
+  &.result-torrent {
+    .extra-info > :not(:last-child) { margin-right: @spacing_large; }
+  }
+  .videos-gallery &.result-torrent {
+    .torrent-banner {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      color: @text-muted-color;
+      font-weight: bold;
+      padding: @spacing_small @spacing_large;
+      text-transform: uppercase;
+      display: flex;
+      justify-content: space-between;
+      font-size: @fontsize_small;
+
+      .torrent-data {
+        text-transform: none;
+        font-weight: normal;
+
+        & > :not(:first-child) {
+          margin-left: @spacing_small;
+        }
+      }
+    }
+  }
+  &.result-videos, .videos-gallery &.result-torrent {
+    position: relative;
+    .widget-border(@dim-color-lighter);
+    border-radius: @corner-radius;
+
+    .result-content {
+      margin: 0px;
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+
+      .result_header { 
+        margin-top: 0; 
+        a {
+          word-wrap: break-word;
+        }
+      }
+
+      & > .thumbnail { position: relative; }
+      & > :not(.thumbnail) {
+        margin-top: @spacing_medium;
+        height: 100%;
+        display: flex;
+        padding: @spacing_medium @spacing_large;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+      .thumbnail > img { 
+        width: 100%;
+        height: 9px * @video-scale;
+        object-fit: cover;
+        object-position: center;
+        display: block;
+      }
+
+      .subheader {
+        .result_engine {
+          float: right;
+          img {
+            width: 16px;
+            height: 16px;
+            margin-left: @spacing_medium;
+            vertical-align: middle;
+          }
+        }
+      }
+    }
+  }
+  
+  .external-link {
+    font-size: @fontsize_small;
+    color: #39a441;
+  }
+
+  .extra-info {
+    color: @text-muted-color;
+  }
+
+
+  .code-block {
+    background-color: @dim-color-superlighter;
+    padding: 0 @spacing_large;
+    border-radius: @corner-radius;
+    border: 1px solid @dim-color-light;
+
+    pre {
+      white-space: pre-wrap;
+    }
+  }
+}
+
+.result.result-default, .result.result-torrent {
+  margin-bottom: @spacing_xx-large;
+}
+.result.result-images {
+  display: inline;
+
+  .img-thumbnail {
+    width: 100%;
+    border: none;
+    margin-bottom: @spacing_medium;
+  }
+}
+
+#results.images-gallery {
+  display: flex;
+  flex-wrap: wrap;
+
+  .result.result-images {
+    display: block;
+    flex: 20%;
+    height: 200px;
+    max-height: 200px;
+    overflow: hidden;
+  }
+}
+.videos-gallery {
+  display: flex;
+  flex-wrap: wrap;
+
+  // torrents in grid mode do not need margin
+  .result.result-torrent { margin-bottom: 0; }
+}
+@supports(display: grid) {
+  #results.images-gallery {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+    grid-gap: @spacing_medium;
+  
+    .result.result-images {
+      display: block;
+      text-align: center;
+      overflow: hidden;
+
+      .img-thumbnail {
+        height: 100%;
+        width: auto;
+      }
+    }
+  } 
+  .videos-gallery {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(16px * @video-scale, 1fr));
+    grid-gap: @spacing_large;
+  
+    .result.result-videos, .result.result-torrent {
+      display: block;
+      overflow: hidden;
+    }
+  }
+}
+#default_images_container {
+  column-count: 5;
+  column-gap: @spacing_medium;
+  margin-bottom: @spacing_xx-large;
+
+  .img-thumb-link {
+    display: block;
+    max-height: 120px;
+    overflow: hidden;
+  }
+}
+
+
+#suggestions, #corrections {
+  form {
+    display: inline-block;
+    .btn { text-transform: none; }
+  }
+}
+
+
+.infobox {
+
+  margin-top: @spacing_xx-large;
+
+  .head {
+    .title {
+      font-size: @fontsize_x-large;
+      margin-top: 0;
+      margin-bottom: 0;
+    }
+    small { color: @text-muted-color; }
+  }
+
+  .body {
+    .main-content {
+    }
+    .image-container {
+      max-height: 250px;
+      overflow: hidden;
+      text-align: center;
+    }
+    .content { flex: 3; }
+
+    img {
+      max-width: 100%;
+      width: 100%;
+      margin-top: @spacing_large;
+    }
+  }
+
+  .footer {
+    .links a {
+      padding-left: 0;
+      padding-top: 0;
+      padding-bottom: @spacing_large;
+      padding-right: @spacing_xx-large;
+      display: inline-block;
+      font-size: @fontsize_small;
+    }
+  }
+
+  table { 
+    margin-top: @spacing_large; 
+    width: 100%;
+  }
+  table tr {
+    vertical-align: top;
+
+    td {
+      padding: 0;
+      padding-bottom: @spacing_medium;
+    }
+
+    & > .label {
+      text-align: right;
+      color: @text-muted-color;
+      padding-right: @spacing_large;
+    }
+  }
+}
+
+.first-page-media-results {
+  margin-bottom: @spacing_xx-large;
+
+  .header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  
+    .title { font-size: @fontsize_large; }
+  }
+}
+
+
+.tablet-mq({
+  #results.images-gallery {
+    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+
+    .result.result-images {
+      height: 140px;
+      max-height: 140px;
+    }
+  }
+});
\ No newline at end of file
diff --git a/searx/static/themes/eelo/less/eelo/search.less b/searx/static/themes/eelo/less/eelo/search.less
new file mode 100644
index 0000000000000000000000000000000000000000..e344ceca223153275311831d93222347de37464d
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/search.less
@@ -0,0 +1,238 @@
+
+#search_form {
+  @logo-link-size: 32px;
+  @logo-link-spacing: 4px;
+  @input-size: 38px;
+
+  #search_input_container {
+    position: relative;
+    display: flex;
+    align-items: center;
+
+    .widget-border(rgba(0, 0, 0, 0.24));
+    border-radius: 50px;
+    height: @input-size;
+    &:hover, &:active { box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.13); }
+    &:extend(.box-shadow-transition);
+
+    // the actual input
+    #q {
+      font-size: @fontsize_medium;
+
+      border: none;
+      height: 100%;
+      width: 100%;
+      min-width: 0;
+      padding-left: @spacing_large;
+      background-color: transparent;
+    }
+    #q:focus { outline: none; }
+  
+    button[type="submit"] {
+      position: relative;
+      height: 100%;
+      width: @input-size;
+      min-width: @input-size;
+      border: none;
+      background: none;
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+  
+      .icon { transition: fill 0.2s ease-in-out, transform 0.1s ease-in-out; }
+    }
+    button[type="submit"]:hover {
+      .icon { 
+        fill: @color_accent;
+        transform: scale(1.2);
+      }
+    }
+  }
+
+  // inline search form
+  #logo, #logo_link { 
+    height: @logo-link-size;
+  }
+  #logo_link {
+    padding-left: @logo-link-spacing;
+  }
+
+  // some minor tweaks for RTL
+  #search_input_container.rtl {
+    #q {
+      margin-left: 0;
+      padding-right: @spacing_large;
+    }
+    #logo_link {
+      padding-left: 0;
+      padding-right: @logo-link-spacing;
+    }
+  }
+
+  // style overrides for typeahead
+  .twitter-typeahead {
+    position: unset !important;
+    background-color: transparent;
+    width: 100%;
+    height: 100%;
+  }
+  input.tt-hint {
+    display: none;
+  }
+  .tt-dropdown-menu {
+    position: absolute;
+    left: 0;
+    right: 0 !important;
+    top: calc(100% + @spacing_large) !important;
+    border-radius: @corner-radius;
+
+    .widget-border();
+    width: 100% !important;
+    box-sizing: border-box !important;
+    background-color: @grey;
+    padding-left: @spacing_large;
+    padding-right: @spacing_large;
+
+    & .tt-cursor, & .tt-highlight {
+      font-weight: bold;
+    }
+  }
+
+  &.inline-search {
+    .tt-dropdown-menu {
+      padding-left: @spacing_large + @logo-link-size + @logo-link-spacing;
+    }
+  }
+
+
+
+  // advanced search params, search topic, lang and time.
+  #search_params {
+    display: flex;
+    justify-content: space-between;
+    font-size: @fontsize_small;
+    padding-bottom: @spacing_large;
+    padding-top: @spacing_large;
+    padding-left: @spacing_x-large;
+    padding-right: @spacing_x-large;
+
+    select, label { font-size: @fontsize_small; }
+    select {
+      color: rgba(0, 0, 0, .5);
+      text-align: right;
+      padding-right: 32px;
+    }
+    #time_and_lang {
+      text-align: right;
+      // > :first-child { margin-right: @spacing_large; }
+      > * { width: 160px; }
+    }
+    
+  }
+
+
+  .search_categories, #categories {
+    text-transform: capitalize;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    position: relative;
+    flex: 100%;
+  
+    label {
+      flex-basis: auto;
+      font-size: @fontsize_small;
+      font-weight: normal;
+      margin-right: @spacing_large;
+      cursor: pointer;
+    }
+  
+    input[type="radio"]:checked + label {
+      color: @color_accent;
+      font-weight: bold;
+    }
+  }
+
+  #more_categories {
+    position: absolute;
+    top: @spacing_x-large;
+    display: flex;
+    flex-direction: column;
+    border-radius: @corner-radius;
+    .widget-border();
+    background-color: @grey;
+    padding-bottom: @spacing_large / 2;
+    padding-top: @spacing_large / 2;
+    left: 0;
+    z-index: 998;
+  }
+  #more_categories > label {
+    padding: @spacing_large;
+    padding-bottom: @spacing_large / 2;
+    padding-top: @spacing_large / 2;
+    white-space: nowrap;
+    margin-right: 0;
+
+    &:hover {
+      background-color: @dim-color-lighter;
+    }
+  }
+}
+#more_categories_container {
+  border-left: 1px solid rgba(0, 0, 0, 0.24);
+  padding-left: @spacing_large;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+#show_more_categories_ { cursor: default; }
+#more_categories_toggle:checked, #more_categories_toggle_[checked] {
+  & ~ #more_categories { display: flex; }
+  & ~ #show_more_categories { display: none; }
+  & ~ #show_less_categories { display: initial; }
+}
+#more_categories_toggle:not(:checked), #more_categories_toggle_:not([checked]) {
+  & ~ #more_categories { display: none; }
+  & ~ #show_more_categories { display: initial; }
+  & ~ #show_less_categories { display: none; }
+}
+
+// make advanced options scrollable on mobile
+.mobile-mq({
+  #search_form {
+    #search_params {
+      overflow-x: scroll;
+
+      #time_and_lang { 
+        display: flex;
+        margin-left: @spacing_xx-large;
+        > * { width: auto; }
+      }
+    }
+    #search_params, #categories { flex-wrap: nowrap; }
+
+    #more_categories {
+      margin-left: @spacing_x-large;
+      padding: @spacing_medium @spacing_large;
+      border-radius: @spacing_large;
+      position: relative;
+      flex-direction: row;
+      align-items: center;
+      top: 0;
+      margin-left: @spacing_large;
+
+      > label { padding: 0; }
+      > label:not(:last-child) {
+        margin-right: @spacing_large;
+      }
+    }
+  }
+  #search_form.inline-search > #search_input_container {
+    margin-right: @spacing_medium * 2 + 24px;
+  }
+  .tt-dropdown-menu {
+    padding-left: @spacing_large;
+  }
+});
diff --git a/searx/static/themes/eelo/less/eelo/widgets.less b/searx/static/themes/eelo/less/eelo/widgets.less
new file mode 100644
index 0000000000000000000000000000000000000000..c5e8f02958d3cbfa87bb4f8302f9945da6a5fb62
--- /dev/null
+++ b/searx/static/themes/eelo/less/eelo/widgets.less
@@ -0,0 +1,131 @@
+.block {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.text-muted { color: @text-muted-color; }
+
+.danger { color: @color_danger; }
+
+.widget {
+  .widget-border();
+  padding: 4px 12px;
+  background-color: transparent;
+
+  transition: @border-color-transition, @color-transition, @background-color-transition;
+}
+
+.btn {
+  &:extend(.widget);
+
+  padding: 8px 16px;
+
+  text-transform: capitalize;
+  background-color: transparent;
+  border-radius: @corner-radius;
+  text-align: center;
+  font-size: @fontsize_medium;
+  font-weight: bold;
+  cursor: pointer;
+
+  &:not(:disabled) {
+    color: @color_accent;
+    border-color: @color_accent;
+  }
+  &:hover:not(:disabled) { 
+    border-color: @color_accent__dark;
+    color: @color_accent__dark;
+  }
+
+  &.primary, input&[type="submit"] {
+    background-color: @color_accent;
+    color: @color_accent__op;
+    border-color: @dim-color-light;
+    &:hover {
+      color: @color_accent__op;
+      background-color: @color_accent__dark;
+    }
+  }
+  &.danger { 
+    &:extend(.danger); 
+    color: @color_danger;
+    border-color: @color_danger;
+  }
+  &.danger:hover { 
+    border-color: @dim-color-light; 
+    background-color: @color_danger;
+    color: @color_danger__op;
+  }
+
+  &.btn-flat {
+    border: none;
+    border-radius: 0;
+    background-color: transparent;  
+  }
+
+  &.btn-flat:hover {
+    color: @color_accent__dark;
+  }
+
+  &.btn-block { &:extend(.block); }
+
+  // used in dark backgrounds
+  &.plain-white {
+    border-color: rgba(255, 255, 255, .4);
+    color: rgba(255, 255, 255, .8);
+    background-color: rgba(0, 0, 0, .5);
+  }
+}
+
+.checkmark .icon {
+  &:extend(.fill-transition);
+  fill: @text-color;
+
+  &.checked { fill: @color_accent; }
+}
+.checkmark_input {
+  display: none;
+
+  &.inverted:checked {
+    & + .checkmark .checked { display: none; }
+    & + .checkmark .unchecked { display: initial; }
+  }
+  &.inverted:not(:checked) {
+    & + .checkmark .checked { display: initial; }
+    & + .checkmark .unchecked { display: none; }
+  }
+}
+
+
+.collapser {
+  input:checked ~ .collapse { display: initial; }
+  input:not(:checked) ~ .collapse { display: none; }
+}
+
+
+.custom-select {
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+
+  font-weight: normal;
+
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
+cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn
+sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8
+6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0
+ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w
+Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
+7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
+
+
+  &.flat { border: none; }
+
+  &:not(.flat) {
+    &:extend(.widget);
+    width: 100%;
+    border-radius: 50px;
+  }
+}
\ No newline at end of file
diff --git a/searx/static/themes/eelo/package.json b/searx/static/themes/eelo/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7eae9df2bf0fdc67ac2ba48ed0d2c3ccb183b2c7
--- /dev/null
+++ b/searx/static/themes/eelo/package.json
@@ -0,0 +1,16 @@
+{
+    "devDependencies": {
+        "grunt": "~0.4.5",
+        "grunt-contrib-uglify": "~0.6.0",
+        "grunt-contrib-watch" : "~0.6.1",
+        "grunt-contrib-concat" : "~0.5.0",
+        "grunt-contrib-jshint" : "~0.10.0",
+        "grunt-contrib-less" : "~0.11.0"
+    },
+    
+    "scripts": {
+        "build": "npm install && grunt",
+        "start": "grunt watch",
+        "test": "grunt"
+    }
+}
diff --git a/searx/static/themes/oscar/.gitignore b/searx/static/themes/oscar/.gitignore
index c2658d7d1b31848c3b71960543cb0368e56cd4c7..18566ec8b0a991ee08d80f94b59900ac9c3c82f1 100644
--- a/searx/static/themes/oscar/.gitignore
+++ b/searx/static/themes/oscar/.gitignore
@@ -1 +1,2 @@
 node_modules/
+.vscode
\ No newline at end of file
diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
index bf173335961cbc2a21b84d15be7085bbba449074..9a3d16dc4b1ad6c7bbc1d24b381f4bb106015368 100644
--- a/searx/templates/__common__/about.html
+++ b/searx/templates/__common__/about.html
@@ -56,8 +56,5 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
 <h3>Installation/WSGI support?</h3>
 <p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p>
 
-<h3>How to debug engines?</h3>
-<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p>
-
 </div>
 {% include "__common__/aboutextend.html" ignore missing %}
diff --git a/searx/templates/eelo/404.html b/searx/templates/eelo/404.html
new file mode 100644
index 0000000000000000000000000000000000000000..03c96eb3f7bd6028f466ac0a2042014c50ac847b
--- /dev/null
+++ b/searx/templates/eelo/404.html
@@ -0,0 +1,15 @@
+{% extends "eelo/base.html" %}
+{% block content %}
+<div class="container contents full">
+    <div>
+        <div id="page_not_found_404" class="content-small-centered">
+            <img src="{{ url_for('static', filename='img/not_found.svg') }}" alt="">
+            <h2>{{_("Page not found")}}</h2>
+    
+            {% autoescape false %}
+            <p>{{ _('Go to %(search_page)s.', search_page=unicode('<a href="{}">{}</a>').format(url_for('index'), _('search page'))) }}</p>
+            {% endautoescape %}
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/searx/templates/eelo/about.html b/searx/templates/eelo/about.html
new file mode 100644
index 0000000000000000000000000000000000000000..159fffcc7e9baf1389e869eb4f895c0b5952078c
--- /dev/null
+++ b/searx/templates/eelo/about.html
@@ -0,0 +1,7 @@
+{% extends "eelo/base.html" %}
+{% block title %}{{ _('about') }} - {% endblock %}
+{% block content %}
+<div class="container">
+  {% include '__common__/about.html' %}
+</div>
+{% endblock %}
diff --git a/searx/templates/eelo/base.html b/searx/templates/eelo/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..94dae554ad56ab34361792c92761be4b6128f9ff
--- /dev/null
+++ b/searx/templates/eelo/base.html
@@ -0,0 +1,111 @@
+{% from 'eelo/macros.html' import icon %}
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
+<head>
+    <meta charset="UTF-8" />
+    <meta name="description" content="spot ecloud global, powered by searx" />
+    <meta name="keywords" content="spot, ecloud, searx, search, search engine, metasearch, meta search" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="generator" content="searx/{{ searx_version }}">
+    <meta name="referrer" content="no-referrer">
+    <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
+    {% block meta %}{% endblock %}
+    <title>{% block title %}{% endblock %}{{ instance_name }}</title>
+
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/eelo.min.css') }}" type="text/css" />
+
+    {% for css in styles %}
+        <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
+    {% endfor %}
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="{{ url_for('static', filename='js/html5shiv.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='js/respond.min.js') }}"></script>
+    <![endif]-->
+
+    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
+
+    {% block styles %}
+    {% endblock %}
+    {% block head %}
+    {% endblock %}
+
+    <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
+
+    <script type="text/javascript">
+        searx = {};
+        searx.method = "{{ method or 'POST' }}";
+        searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
+    </script>
+    <noscript>
+        <style type="text/css">
+            .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}
+            .margin_top_if_nojs {margin-top: 20px;}
+            .hide_if_nojs {display: none !important;overflow:none !important;}
+            .disabled_if_nojs {pointer-events: none; cursor: default; text-decoration: line-through;}
+        </style>
+    </noscript>
+</head>
+
+
+<body>
+    {% include 'eelo/components/icons.html' %}
+    {% include 'eelo/components/navbar.html' %}
+
+    {% set inline_search_form = true %}
+    <main>
+
+    {% block site_alert_error %}
+    {% endblock %}
+    {% block site_alert_warning %}
+    {% endblock %}
+    {% block site_alert_info %}
+    {% endblock %}
+    {% block site_alert_success %}
+    {% endblock %}
+
+    {% block content %}
+    {% endblock %}
+
+    <div id="image_view_modal" class="hidden">
+        <div class="card-container">
+            <div id="image_view_card">
+                <button onclick="close_image_view_modal()">{{ icon("close") }}</button>
+                <img id="image_view_image" src="">
+                <div class="options">
+                    <a id="image_view_file_link" class="btn" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} href="#">{{_("view file")}}</a>
+                    <a id="image_view_url_link" class="btn" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} href="#">{{_("view source")}}</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    </main>
+    <footer>
+        {% block footer %}
+        {% endblock %}
+        <p class="text-muted">
+            <small>
+                e Foundation 2018-2019,
+                {{ _('Powered by') }} <a href="https://gitlab.e.foundation/e/cloud/my-spot">Spot</a>
+                {{ metadata_version }}.<br/>An open-source metasearch engine forked from <a href="https://asciimoo.github.io/searx/">Searx</a> {{ searx_version }}.
+                <span class="links">
+                    <a href="https://e.foundation">{{ _('About') }}</a>
+                    <a href="https://e.foundation/privacy-policy">{{ _('Privacy') }}</a>
+                </span>
+            </small>
+        </p>
+    </footer>
+
+
+    <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
+    {% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
+    <script src="{{ url_for('static', filename='js/require-2.1.15.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/searx.min.js') }}"></script>
+
+    {% for script in scripts %}
+    <script src="{{ url_for('static', filename=script) }}"></script>
+    {% endfor %}
+</body>
+</html>
diff --git a/searx/templates/eelo/components/categories.html b/searx/templates/eelo/components/categories.html
new file mode 100644
index 0000000000000000000000000000000000000000..5b2e66dd68649584bc1f101a3bab5d947e4945ab
--- /dev/null
+++ b/searx/templates/eelo/components/categories.html
@@ -0,0 +1,29 @@
+{% macro category_widget(category) -%}
+<input class="hidden" type="radio" id="checkbox_{{ category|replace(' ', '_') }}" name="category" value="{{ category }}" {% if category == selected_category %}checked="checked"{% endif %} />
+<label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
+{%- endmacro -%}
+
+{% set main_categories = ["general", "images", "videos", "news"] %}
+
+<div id="categories" {% if rtl %} class="rtl" {% endif %}>
+{% for category in categories %}
+    {% if category in main_categories + [selected_category] %}
+        {{ category_widget(category) }}
+    {% endif %}
+{% endfor %}
+
+    <div id="more_categories_container">
+        <input type="checkbox" name="more_categories_toggle" id="more_categories_toggle" class="hidden">
+        <label for="more_categories_toggle" id="show_more_categories">{{_("More")}}</label>
+        <label for="more_categories_toggle" id="show_less_categories">{{_("Less")}}</label>
+        <span id="show_more_categories_" class="hidden">{{_("More")}}</span>
+        <span id="show_less_categories_" class="hidden">{{_("Less")}}</span>
+        <div id="more_categories">
+        {% for category in categories %}
+        {% if not (category in main_categories + ["map"] or category == selected_category) %}
+            {{ category_widget(category) }}
+        {% endif %}
+        {% endfor %}
+        </div>
+    </div>
+</div>
diff --git a/searx/templates/eelo/components/icons.html b/searx/templates/eelo/components/icons.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d76c501176273751e40d907897e404844bd010e
--- /dev/null
+++ b/searx/templates/eelo/components/icons.html
@@ -0,0 +1,26 @@
+<!-- Google material icons, https://material.io  -->
+<svg xmlns="http://www.w3.org/2000/svg" class="icons" id="icons" width="0" height="0" viewBox="0 0 24 24" >
+  <defs>
+    
+    <g id="search">
+      <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/>
+    </g>
+
+    <g id="close">
+      <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+    </g>
+
+    <g id="checkbox_checked">
+      <path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/>
+    </g>
+
+    <g id="checkbox_unchecked">
+      <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+    </g>
+
+    <g id="menu">
+      <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
+    </g>
+
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/searx/templates/eelo/components/infobox.html b/searx/templates/eelo/components/infobox.html
new file mode 100644
index 0000000000000000000000000000000000000000..39a077da0dc6b4c5230bf3f90837a54d788fcd8c
--- /dev/null
+++ b/searx/templates/eelo/components/infobox.html
@@ -0,0 +1,51 @@
+{% from 'eelo/macros.html' import result_link with context %}
+
+<div class="infobox">
+    <div class="head">
+        <h4 class="title">{{ infobox.infobox }}</h4>
+        <small>{{infobox.engine}}</small>
+    </div>
+
+    <div class="body">
+
+        <div class="main-content">
+            {% if infobox.img_src %}
+            <div class="image-container">
+                <img class="main-image" src="{{ image_proxify(infobox.img_src) }}" alt=""/>
+            </div>
+            {% endif %}
+    
+            {% if infobox.content %}
+            <p class="content"><bdi>{{ infobox.content }}</bdi></p> 
+            {% endif %}
+        </div>
+
+        {% if infobox.attributes %}
+        <table>
+            {% for attribute in infobox.attributes %}
+            <tr>
+                <td class="label"><bdi>{{ attribute.label }}</bdi></td>
+                {% if attribute.image %}
+                <td class="value"><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
+                {% else %}
+                <td class="value"><bdi>{{ attribute.value }}</bdi></td>
+                {% endif %}
+            </tr>
+            {% endfor %}
+        </table>
+        {% endif %}
+    </div>
+
+    <div class="footer">
+        {% if infobox.urls %}
+        <div class="links">
+            <p>{{_("More information:")}}</p>
+            <bdi>
+            {% for url in infobox.urls %}
+            {{ result_link(url.url, url.title, 'btn btn-flat') }}
+            {% endfor %}
+            </bdi>
+        </div>
+        {% endif %}
+    </div>
+</div>
diff --git a/searx/templates/eelo/components/languages.html b/searx/templates/eelo/components/languages.html
new file mode 100644
index 0000000000000000000000000000000000000000..a22a63fc3684870fdf0f71cfe68f5979701165ca
--- /dev/null
+++ b/searx/templates/eelo/components/languages.html
@@ -0,0 +1,11 @@
+{% if preferences %}
+<select class="custom-select {%if flat_lang_selector%} flat {%endif%}" name='language'>
+{% else %}
+<select class="time_range custom-select {%if flat_lang_selector%} flat {%endif%}" id='language' name='language'>
+{% endif %}
+	{% for lang_id, lang_name, country_name, english_name in language_codes | sort(attribute=1) %}
+	<option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
+		{{ lang_name }} ({{ lang_id.split('-')[-1] }})
+	</option>
+	{% endfor %}
+</select>
diff --git a/searx/templates/eelo/components/navbar.html b/searx/templates/eelo/components/navbar.html
new file mode 100644
index 0000000000000000000000000000000000000000..39038d1f60dbadc2509448c34e67ca1f31b5a19a
--- /dev/null
+++ b/searx/templates/eelo/components/navbar.html
@@ -0,0 +1,15 @@
+{% from 'eelo/macros.html' import navbar_menu %}
+<input type="checkbox" name="nav_toggle" id="nav_toggle" class="hidden">
+<nav>
+    <span id="eelo_links">
+        <a href="https://webmail.ecloud.global/">{{_('mail')}}</a>
+        <a href="https://drive.ecloud.global/">{{_('drive')}}</a>
+    </span>
+
+    <span>
+        <a href="{{ url_for('preferences') }}">{{ _('preferences') }}</a>
+    </span>
+</nav>
+<div id="nav_cover"></div>
+
+{{ navbar_menu() }}
diff --git a/searx/templates/eelo/components/search.html b/searx/templates/eelo/components/search.html
new file mode 100644
index 0000000000000000000000000000000000000000..af633376f1d1919267a8eb588d651054410c2d60
--- /dev/null
+++ b/searx/templates/eelo/components/search.html
@@ -0,0 +1,3 @@
+{% from 'eelo/macros.html' import search_bar %}
+
+{% call search_bar(q, rtl=rtl, autofocus=True) %}{% endcall %}
\ No newline at end of file
diff --git a/searx/templates/eelo/components/search_full.html b/searx/templates/eelo/components/search_full.html
new file mode 100644
index 0000000000000000000000000000000000000000..9221b76756bf67d20b258eb297a73e3ed84f8d4e
--- /dev/null
+++ b/searx/templates/eelo/components/search_full.html
@@ -0,0 +1,12 @@
+{% from 'eelo/macros.html' import search_bar %}
+
+{% call search_bar(q, true, rtl) %}
+  <div id="search_params">
+    {% include 'eelo/components/categories.html' %}
+    <span id="time_and_lang">
+      {% set flat_lang_selector = True %}
+      {% include 'eelo/components/languages.html' %}
+      {% include 'eelo/components/time-range.html' %}
+    </span>
+  </div>
+{% endcall %}
diff --git a/searx/templates/eelo/components/time-range.html b/searx/templates/eelo/components/time-range.html
new file mode 100644
index 0000000000000000000000000000000000000000..5c9e3b28bd8af91cdd6b3e5020365908da09f2ac
--- /dev/null
+++ b/searx/templates/eelo/components/time-range.html
@@ -0,0 +1,17 @@
+<select name="time_range" id="time-range" class="custom-select flat">
+    <option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range  else ""}}>
+        {{ _('Anytime') }}
+    </option>
+    <option id="time-range-day" value="day" {{ "selected" if time_range=="day" else ""}}>
+        {{ _('Last day') }}
+    </option>
+    <option id="time-range-week" value="week" {{ "selected" if time_range=="week" else ""}}>
+        {{ _('Last week') }}
+    </option>
+    <option id="time-range-month" value="month" {{ "selected" if time_range=="month" else ""}}>
+        {{ _('Last month') }}
+    </option>
+    <option id="time-range-year" value="year" {{ "selected" if time_range=="year" else ""}}>
+        {{ _('Last year') }}
+    </option>
+</select>
diff --git a/searx/templates/eelo/index.html b/searx/templates/eelo/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..fbebaf2f78a3abdca8c3a58ae0e307937a277559
--- /dev/null
+++ b/searx/templates/eelo/index.html
@@ -0,0 +1,16 @@
+{% extends "eelo/base.html" %}
+{% block content %}
+
+{% if errors %}
+{% from 'eelo/macros.html' import errors_panel %}
+<div class="content-small-centered">
+    {{ errors_panel(errors, error_details) }}
+</div>
+{% endif %}
+
+<div id="index">
+    <img src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" />
+    <img id="logo_inline" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="e logo" />
+    {% include 'eelo/components/search.html' %}
+</div>
+{% endblock %}
diff --git a/searx/templates/eelo/macros.html b/searx/templates/eelo/macros.html
new file mode 100644
index 0000000000000000000000000000000000000000..36d3ed6c41462c2d8a3f7a47d95abeaf9e659cec
--- /dev/null
+++ b/searx/templates/eelo/macros.html
@@ -0,0 +1,149 @@
+<!-- use icons defined in icons.html -->
+{% macro icon(action, classes="") -%}
+  <svg class="icon {{ classes }}" viewBox="0 0 24 24" width="24px" height="24px">
+    <use href="#{{ action }}" xlink:href="#{{ action }}"></use>
+  </svg>
+{%- endmacro %}
+
+<!-- Search bar base -->
+{% macro search_bar(value="", inline=false, rtl=false, autofocus=false) -%}
+    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form" {% if inline %}class="inline-search" {% endif %} role="search">
+        <div id="search_input_container" {% if rtl -%} class="rtl" {%- endif %}>
+            {% if inline %}
+            <a href="{{ url_for('index') }}" id="logo_link"><img src="{{ url_for('static', filename='themes/eelo/img/logo.png') }}" alt="" id="logo"></a>
+            {% endif %}
+            <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ value }}" {% if autofocus %}autofocus{% endif %}>
+            <button type="submit">{{ icon('search') }}</button>
+        </div>
+        
+        {{ caller() }}
+    </form>
+{%- endmacro %}
+
+{% macro navbar_menu() -%}
+    <label for="nav_toggle" id="nav_toggle_btn">{{icon("menu", "menu-open")}}{{icon("close", "menu-close")}}</label>
+{%- endmacro %}
+
+
+<!-- Draw favicon -->
+{% macro draw_favicon(favicon) -%}
+    <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='themes/eelo/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
+{%- endmacro %}
+
+{%- macro result_link(url, title, classes='') -%}
+<a href="{{ url }}" {% if classes %}class="{{ classes }}" {% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ title }}</a>
+{%- endmacro -%}
+
+<!-- Draw result header -->
+{% macro result_header(result, favicons, put_icon=True) -%}
+<h4 class="result_header">{% if result.engine~".png" in favicons and put_icon %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>
+{%- endmacro %}
+{% macro result_engine(result, favicons) -%}
+<span class="result_engine">{{ result.engine }}{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine)}}{% endif %}</span>
+{%- endmacro %}
+
+<!-- Draw result sub header -->
+{% macro result_sub_header(result) -%}
+<small class="subheader">
+    {% if result.publishedDate %}
+    <time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>
+    {% endif %}
+    {% if caller %}
+    <span class="links">{{caller()}}</span>
+    {% endif %}
+</small>
+{%- endmacro %}
+
+<!-- Draw result footer -->
+{% macro result_footer(result) -%}
+
+<a class="external-link" href="{{result.url}}">{{ result.pretty_url }}</a>
+{%- endmacro %}
+
+<!-- Draw result footer -->
+{% macro result_footer_rtl(result) -%}
+    <div class="clearfix"></div>
+    {% for engine in result.engines %}
+        <span class="label label-default">{{ engine }}</span>
+    {% endfor %}
+    <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>
+    {% if proxify %}
+    <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
+    {% endif %}
+    <div class="external-link">{{ result.pretty_url }}</div>
+{%- endmacro %}
+
+{% macro checkbox_toggle(id, blocked) -%}
+    <input class="checkmark_input inverted" type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
+    <label for="{{ id }}" class="checkmark">
+        {{ icon("checkbox_checked", "checked") }}
+        {{ icon("checkbox_unchecked", "unchecked") }}
+    </label>
+{%- endmacro %}
+
+{% macro support_toggle(supports) -%}
+    {% if supports %}
+    <span class="label label-success">
+        {{ _("supported") }}
+    </span>
+    {% else %}
+    <span class="label label-danger">
+        {{ _("not supported") }}
+    </span>
+    {% endif %}
+{%- endmacro %}
+
+
+
+{% macro search_link(text, q, method=None, time_range=None, lang=None, category=None) -%}
+<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation">
+    <input type="hidden" name="q" value="{{ q }}" />
+    {% if time_range %}
+    <input type="hidden" name="time_range" value="{{ time_range }}" />
+    {% endif %}
+    {% if time_range %}
+    <input type="hidden" name="language" value="{{ lang }}" />
+    {% endif %}
+    {% if category %}
+    <input type="hidden" name="category" value="{{ category }}" />
+    {% endif %}
+    <button type="submit" class="btn btn-flat" >{{ text }}</button>
+</form>
+{% endmacro %}
+
+
+{% macro collapser(text, id, classes) -%}
+<div class="collapser">
+    <input type="checkbox" class="hidden" id="{{id}}">
+    <label for="{{id}}" class="{{classes}}">{{text}}</label>
+    <div class="collapse">
+        {{ caller() }}
+    </div>
+</div>
+{%- endmacro %}
+
+
+{% macro format_filesize(filesize) -%}
+{% if filesize < 1024 %}{{ filesize }} {{ _('Bytes') }}
+{% elif filesize < 1024*1024 %}{{ '{0:0.2f}'.format(filesize/1024) }} {{ _('kiB') }}
+{% elif filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(filesize/1024/1024) }} {{ _('MiB') }}
+{% elif filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(filesize/1024/1024/1024) }} {{ _('GiB') }}
+{% else %}{{ '{0:0.2f}'.format(filesize/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif %}
+{%- endmacro %}
+
+
+{% macro errors_panel(errors, error_detail) -%}
+<section id="errors" class="danger">
+    <h4 class="title">{{_("Error!")}}</h4>
+    <ul>
+        {% for message in errors %}
+        <li>{{ message }}</li>
+        {% endfor %}
+    </ul>
+    {% if error_detail %}
+    <pre>
+{{error_detail}}
+    </pre>
+    {% endif %}
+</section>
+{%- endmacro %}
diff --git a/searx/templates/eelo/messages/no_cookies.html b/searx/templates/eelo/messages/no_cookies.html
new file mode 100644
index 0000000000000000000000000000000000000000..d7cc98d5730d56c3b77e62127ac0a8ade0420f41
--- /dev/null
+++ b/searx/templates/eelo/messages/no_cookies.html
@@ -0,0 +1,4 @@
+<div class="alert alert-info fade in" role="alert">
+    <strong class="lead">{{ _('Information!') }}</strong>
+    {{ _('currently, there are no cookies defined.') }}
+</div>
diff --git a/searx/templates/eelo/messages/no_results.html b/searx/templates/eelo/messages/no_results.html
new file mode 100644
index 0000000000000000000000000000000000000000..f27404bd2ff68029167a54cf2f8bdc84aaf6d42f
--- /dev/null
+++ b/searx/templates/eelo/messages/no_results.html
@@ -0,0 +1,28 @@
+<div id="no_results_msg">
+  <img src="{{ url_for('static', filename='img/empty_space.svg') }}" alt="">
+  <h2>{{_("Sorry, no results found!")}}</h2>
+</div>
+
+
+
+{% if unresponsive_engines %}
+<div id="unresponsive_engines" class="content-small-centered">
+    <section>
+        <p>{{ _('Some engines are not working as expected!') }}</p>
+        <pre>
+{% for engine_name, error_type in unresponsive_engines %}
+- {{ engine_name }} ({{ error_type }}){% if not loop.last %}<br/>{% endif %}
+{% endfor %}
+        </pre>
+    </section>
+
+    <section>
+        <p>{{ _('Please, try the following.') }}</p>
+        <ul>
+            <li>{{_("Search again later")}}</li>
+            <li>{{_("Try another query")}}</li>
+            <li>{{_("Report this problem")}}</li>
+        </ul>
+    </section>
+</div>
+{% endif %}
diff --git a/searx/templates/eelo/messages/save_settings_successfull.html b/searx/templates/eelo/messages/save_settings_successfull.html
new file mode 100644
index 0000000000000000000000000000000000000000..4b0420cca5cce19def150e54ac87d4b060737554
--- /dev/null
+++ b/searx/templates/eelo/messages/save_settings_successfull.html
@@ -0,0 +1,9 @@
+{% from 'eelo/macros.html' import icon %}
+<div class="alert alert-success fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">{{ _('Close') }}</span>
+    </button>
+    <strong class="lead">{{ icon('ok-sign') }} {{ _('Well done!') }}</strong>
+    {{ _('Settings saved successfully.') }}
+</div>
diff --git a/searx/templates/eelo/messages/unknow_error.html b/searx/templates/eelo/messages/unknow_error.html
new file mode 100644
index 0000000000000000000000000000000000000000..f03d4c431ecbe3a123ea1997e762c32872a405d0
--- /dev/null
+++ b/searx/templates/eelo/messages/unknow_error.html
@@ -0,0 +1,9 @@
+{% from 'eelo/macros.html' import icon %}
+<div class="alert alert-danger fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">{{ _('Close') }}</span>
+    </button>
+    <strong class="lead">{{ icon('exclamation-sign') }} {{ _('Oh snap!') }}</strong>
+    {{ _('Something went wrong.') }}
+</div>
diff --git a/searx/templates/eelo/preferences.html b/searx/templates/eelo/preferences.html
new file mode 100644
index 0000000000000000000000000000000000000000..e32160964f83cc6584b572c1ad5bf8e6e7b3f190
--- /dev/null
+++ b/searx/templates/eelo/preferences.html
@@ -0,0 +1,238 @@
+{% from 'eelo/macros.html' import checkbox_toggle, support_toggle %}
+{% extends "eelo/base.html" %}
+{% block title %}{{ _('preferences') }} - {% endblock %}
+{% block content %}
+
+{% macro preferences_item(info, label, rtl) -%}
+    <div class="preference inline {% if rtl %} rtl {% endif %}">
+        <div>
+            <label>{{ label }}</label>
+            <div class="help-block text-muted">{{ info }}</div>
+        </div>
+        <div>
+            {{ caller() }}
+        </div>
+    </div>
+{% endmacro -%}
+
+
+<div class="container">
+    <h1>{{ _('Preferences') }}</h1>
+</div>
+
+<form method="post" action="{{ url_for('preferences') }}" id="preferences" class="container">
+
+    <div id="controls">
+        <input type="radio" class="tab-radio" id="tab_general_r" value="general" name="tab" checked>
+        <div id="tab_general" class="tab-content">
+            <fieldset>
+                {% set language_label = _('Search language') %}
+                {% set language_info = _('What language do you prefer for search?') %}
+                {% call preferences_item(language_info, language_label, rtl) %}
+                    {% include 'eelo/components/languages.html' %}
+                {% endcall %}
+
+                {% set locale_label = _('Interface language') %}
+                {% set locale_info = _('Change the language of the layout') %}
+                {% call preferences_item(locale_info, locale_label, rtl) %}
+                    <select class="form-control custom-select" name='locale'>
+                        {% for locale_id,locale_name in locales.items() | sort %}
+                        <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                        {% endfor %}
+                    </select>
+                {% endcall %}
+
+                {% set autocomplete_label = _('Autocomplete') %}
+                {% set autocomplete_info = _('Find stuff as you type') %}
+                {% call preferences_item(autocomplete_info, autocomplete_label, rtl) %}
+                    <select class="form-control custom-select" name="autocomplete">
+                        <option value=""> - </option>
+                        {% for backend in autocomplete_backends %}
+                        <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                        {% endfor %}
+                    </select>
+                {% endcall %}
+
+                {% set image_proxy_label = _('Image proxy') %}
+                {% set image_proxy_info = _('Proxying image results through searx') %}
+                {% call preferences_item(image_proxy_info, image_proxy_label, rtl) %}
+                    <select class="form-control custom-select" name='image_proxy'>
+                        <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
+                        <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
+                    </select>
+                {% endcall %}
+
+                {% set safesearch_label = _('SafeSearch') %}
+                {% set safesearch_info = _('Filter content') %}
+                {% call preferences_item(safesearch_info, safesearch_label, rtl) %}
+                    <select class="form-control custom-select" name='safesearch'>
+                        <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
+                        <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
+                        <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
+                    </select>
+                {% endcall %}
+
+                {% set theme_label = _('Themes') %}
+                {% set theme_info = _('Change searx layout') %}
+                {% call preferences_item(theme_info, theme_label, rtl) %}
+                    <select class="form-control custom-select" name="theme">
+                        {% for name in themes %}
+                        <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                        {% endfor %}
+                    </select>
+                {% endcall %}
+
+                {% call preferences_item(_('Choose style for this theme'), _('Style'), rtl) %}
+                    <select class="form-control custom-select" name='oscar-style'>
+                        <option value="logicodev" >Logicodev</option>
+                        <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
+                        <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option>
+                    </select>
+                {% endcall %}
+
+                {% set label = _('Results on new tabs') %}
+                {% set info = _('Open result links on new browser tabs') %}
+                {% call preferences_item(info, label, rtl) %}
+                    <select class="form-control custom-select" name='results_on_new_tab'>
+                        <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>
+                        <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>
+                    </select>
+                {% endcall %}
+            </fieldset>
+        </div> <!-- End General Tab -->
+
+
+        <input type="radio" class="tab-radio" id="tab_engines_r" value="engines" name="tab">
+        <div id="tab_engines" class="tab-content">
+
+            {% for categ in categories %}
+            <!-- <input type="radio" class="tab-radio" id="" value="" name="engines_category_tab"> -->
+            <section id="engines">
+                <h3>{{categ}}</h3>
+                {% for search_engine in engines_by_category[categ] %}
+                {% if not search_engine.private %}
+                    <div class="engine">
+                        {% set disabled = (search_engine.name, categ) in disabled_engines %}
+                        {{ checkbox_toggle('engine_' + search_engine.name | replace(' ', '_') + '__' + categ | replace(' ', '_'), disabled) }}
+                        <span class="data">
+                           <b>{{ search_engine.name }}</b><br>
+                            <small class="danger"><i>
+                                {% set support_text_str = [(stats[search_engine.name].supports_selected_language, "%s %s " | format(locales[current_locale], _("not supported"))), 
+                                                           (search_engine.safesearch == True, _("No safe search")), 
+                                                           (not(stats[search_engine.name]['warn_time'] or stats[search_engine.name]['warn_timeout']), _("Slow"))] %}
+                                {{ support_text_str | rejectattr(0) | map(attribute=1) | join(", ") }}
+                            </i></small>
+                        </span>
+                    </div>
+                {% endif %}
+                {% endfor %}
+            </section>
+            {% endfor %}
+        </div>  <!-- End Engines Tab -->
+
+
+        <input type="radio" class="tab-radio" id="tab_advanced_r" value="advanced" name="tab">
+        <div id="tab_advanced" class="tab-content">
+            <section>
+                <h3>{{_("Plugins")}}</h3>            
+                <fieldset>
+                    <ul>
+                        {% for plugin in plugins %}
+                        <li>
+                            <div>
+                                {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
+                                <b>{{ _(plugin.name) }}</b>
+                            </div>
+                            <p>{{ _(plugin.description) }}</p>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                </fieldset>
+            </section>
+
+            {% if answerers %}
+            <section id="answerers">
+                <h3>{{ _('Answerers') }}</h3>
+                <p>{{ _('This is the list of searx\'s instant answering modules.') }}</p>
+                <ul>
+                    {% for answerer in answerers %}
+                    <li>
+                        <p><b>{{ answerer.info.name }}</b> <i>{{ _('Keywords') }}: {{ answerer.keywords|join(', ') }}</i></p>
+                        <p>{{ answerer.info.description }}</p>
+                        <div>
+                            <b>{{ _('Examples') }}</b>
+                            <p>{{ answerer.info.examples|join(', ') }}</p>
+                        </div>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </section>
+            {% endif %}
+
+            <section id="cookies">
+                <h3>{{ _('Cookies') }}</h3>
+                <p>
+                    {{ _('This is the list of cookies and their values searx is storing on your computer.') }}<br/>
+                    {{ _('With that list, you can assess searx transparency.') }}<br />
+                </p>
+                {% if cookies %}
+                <ul id="cookies_list">
+                    {% for cookie in cookies %}
+                    <li>
+                        <i class="text-muted">{{ cookie }}</i>: <span class="cookie-value">{{ cookies[cookie] }}</span>
+                    </li>
+                    {% endfor %}
+                </ul>
+                {% else %}
+                    {% include 'eelo/messages/no_cookies.html' %}
+                {% endif %}
+            </section>
+        </div> <!-- End Advanced Tab -->
+
+
+        <!-- this layout might not be very optimal without styling, but the benefits of having JS-less tabs are well worth it -->
+        <div id="tabs">
+            <label for="tab_general_r">{{_("General")}}</label>
+            <label for="tab_engines_r">{{_("Engines")}}</label>
+            <label for="tab_advanced_r">{{_("Advanced")}}</label>
+        </div>
+
+        <!-- super hack -->
+        <style>
+            {% for tab_name in ['tab_general_r', 'tab_engines_r', 'tab_advanced_r'] %}
+            #{{tab_name}}:checked ~ #tabs > label[for="{{tab_name}}"] {
+                font-weight: bold;
+            }
+            {% endfor %}
+        </style>
+    </div>
+
+
+    <div id="info">
+        {% if errors %}
+        {% from 'eelo/macros.html' import errors_panel %}
+        {{ errors_panel(errors) }}
+        {% endif %}
+
+        <div id="notice">
+            <p>{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
+            <br/>
+            {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
+            </p>
+        </div>
+
+        <div>
+            <p>{{ _('Search URL of the currently saved preferences') }} <small class="text-muted">({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }})</small>:<br/> </p>
+            <input readonly="" class="select-all-on-click block" type="url" value="{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&amp;q=%s{% endraw %}">
+        </div>
+
+        <section id="action_buttons">
+            <div>
+                <input type="submit" class="btn btn-block" value="{{ _('save') }}" />
+                <a href="{{ url_for('index') }}" class="btn btn-block">{{ _('back') }}</a>
+            </div>
+            <a href="{{ url_for('clear_cookies') }}" class="btn btn-block danger">{{ _('Reset defaults') }}</a>
+        </section>
+    </div>
+</form>
+{% endblock %}
\ No newline at end of file
diff --git a/searx/templates/eelo/privacy.html b/searx/templates/eelo/privacy.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0f449369b0bb0246e2f5a6940f3ea0481cf0487
--- /dev/null
+++ b/searx/templates/eelo/privacy.html
@@ -0,0 +1,10 @@
+{% extends "eelo/base.html" %}
+{% block title %}{{ _('Privacy policy') }} - {% endblock %}
+
+
+{% block content %}
+<div class="container">
+  <h1>{{ _('Privacy') }}</h1>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/searx/templates/eelo/result_templates/code.html b/searx/templates/eelo/result_templates/code.html
new file mode 100644
index 0000000000000000000000000000000000000000..b9659ca2cb5f92da7da37d628d1f74c4a5da800a
--- /dev/null
+++ b/searx/templates/eelo/result_templates/code.html
@@ -0,0 +1,16 @@
+{% from 'eelo/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
+
+{{ result_header(result, favicons) }}
+{% call result_sub_header(result) %}
+  {% if result.repository %}<a href="{{ result.repository }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a>{% endif %}
+{% endcall %}
+
+<div class="result-content">
+  {% if result.content %}{{ result.content|safe }}{% endif %}
+
+  <div dir="ltr" class="code-block">
+    {{ result.codelines|code_highlighter(result.code_language)|safe }}
+  </div>
+</div>
+
+{{ result_footer(result) }}
\ No newline at end of file
diff --git a/searx/templates/eelo/result_templates/default.html b/searx/templates/eelo/result_templates/default.html
new file mode 100644
index 0000000000000000000000000000000000000000..d6a4f9729e7bf957c6a6fe30e79b8a11d906ccb3
--- /dev/null
+++ b/searx/templates/eelo/result_templates/default.html
@@ -0,0 +1,13 @@
+{% from 'eelo/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %}
+
+{{ result_header(result, favicons) }}
+{% call result_sub_header(result) %}
+{% endcall %}
+
+<div class="result-content">
+    <span>
+        {% if result.content %}{{ result.content|safe }}{% endif %}
+    </span>
+</div>
+
+{{ result_footer(result) }}
diff --git a/searx/templates/eelo/result_templates/images.html b/searx/templates/eelo/result_templates/images.html
new file mode 100644
index 0000000000000000000000000000000000000000..fdfdc623a3fe57bc8a8c3a5e57540c4fd2a60391
--- /dev/null
+++ b/searx/templates/eelo/result_templates/images.html
@@ -0,0 +1,4 @@
+<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} data-url="{{ result.url }}" onclick="show_image_view_modal(event)" class="img-thumb-link">
+    <img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail">
+    <div class="hidden">{{ result.content }}</div>
+</a>
\ No newline at end of file
diff --git a/searx/templates/eelo/result_templates/map.html b/searx/templates/eelo/result_templates/map.html
new file mode 100644
index 0000000000000000000000000000000000000000..e5eb67e7bf82dd4b58e0f87865d1af3cc93433a8
--- /dev/null
+++ b/searx/templates/eelo/result_templates/map.html
@@ -0,0 +1,72 @@
+{% from 'eelo/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
+
+{{ result_header(result, favicons) }}
+{{ result_sub_header(result) }}
+
+{% if (result.latitude and result.longitude) or result.boundingbox %}
+    <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>
+{% endif %}
+
+{% if result.osm and (result.osm.type and result.osm.id) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer searx_overpass_request disabled_if_nojs" data-toggle="collapse" data-target="#result-overpass-{{ index }}" data-osm-type="{{ result.osm.type }}" data-osm-id="{{ result.osm.id }}" data-result-table="result-overpass-table-{{ index }}" data-result-table-loadicon="result-overpass-table-loading-{{ index }}" data-btn-text-collapsed="{{ _('show details') }}" data-btn-text-not-collapsed="{{ _('hide details') }}">{{ icon('map-marker') }} {{ _('show details') }}</a></small>
+{% endif %}
+
+{# {% if (result.latitude and result.longitude) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-geodata-{{ index }}" data-btn-text-collapsed="{{ _('show geodata') }}" data-btn-text-not-collapsed="{{ _('hide geodata') }}">{{ icon('map-marker') }} {{ _('show geodata') }}</a></small>
+{% endif %} #}
+
+<div class="container-fluid">
+
+{% if result.address %}
+<p class="row result-content result-adress col-xs-12 col-sm-5 col-md-4" itemscope itemtype="http://schema.org/PostalAddress">
+    {% if result.address.name %}
+        <strong itemprop="name">{{ result.address.name }}</strong><br/>
+    {% endif %}
+    {% if result.address.road %}
+        <span itemprop="streetAddress">
+            {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %}
+            {{ result.address.road }}
+        </span><br/>
+    {% endif %}
+    {% if result.address.locality %}
+        <span itemprop="addressLocality">{{ result.address.locality }}</span>
+        {% if result.address.postcode %}, <span itemprop="postalCode">{{ result.address.postcode }}</span>{% endif %}
+        <br/>
+    {% endif %}
+    {% if result.address.country %}
+        <span itemprop="addressCountry">{{ result.address.country }}</span>
+    {% endif %}
+</p>
+{% endif %}
+
+{% if result.osm and (result.osm.type and result.osm.id) %}
+    <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}"{% if rtl %} dir="ltr"{% endif %}>
+        <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
+        <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
+            <tr><th>key</th><th>value</th></tr>
+        </table>
+    </div>
+{% endif %}
+
+{# {% if (result.latitude and result.longitude) %}
+    <div class="row collapse col-xs-12 col-sm-5 col-md-4" id="result-geodata-{{ index }}">
+        <strong>Longitude:</strong> {{ result.longitude }} <br/>
+        <strong>Latitude:</strong> {{ result.latitude }}
+    </div>
+{% endif %} #}
+
+{% if result.content %}<p class="row result-content col-xs-12 col-sm-12 col-md-12">{{ result.content|safe }}</p>{% endif %}
+
+</div>
+    
+{% if (result.latitude and result.longitude) or result.boundingbox %}
+    <div class="collapse" id="result-map-{{ index }}">
+        <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
+    </div>
+{% endif %}
+
+{% if rtl %}
+{{ result_footer_rtl(result) }}
+{% else %}
+{{ result_footer(result) }}
+{% endif %}
diff --git a/searx/templates/eelo/result_templates/torrent.html b/searx/templates/eelo/result_templates/torrent.html
new file mode 100644
index 0000000000000000000000000000000000000000..d200597bdb1b2b7c40fae018b45ca02744acf248
--- /dev/null
+++ b/searx/templates/eelo/result_templates/torrent.html
@@ -0,0 +1,38 @@
+{% from 'eelo/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, result_link, icon, format_filesize %}
+
+{{ result_header(result, favicons) }}
+{% call result_sub_header(result) %}
+    {% if result.magnetlink %}
+    {{ result_link(result.magnetlink, _('magnet link'), "magnetlink") }}
+    {% endif %}
+    {% if result.torrentfile %}
+    {{ result_link(result.torrentfile, _('torrent file'), "torrentfile") }}
+    {% endif %}
+{% endcall %}
+
+<div class="result-content">
+
+    <div class="extra-info">
+        {% if result.seed and result.leech -%}
+        <span>{{ _('Seeders') }}: {{ result.seed }}</span>
+        <span>{{ _('Leechers') }}: {{ result.leech }}</span>
+        {%- endif %}
+    
+        {% if result.filesize %}
+        <span class="badge"> {{ _('Filesize') }}:
+            {{ format_filesize(result.filesize) }}
+        </span>
+        {% endif %}
+    
+        {% if result.files %}
+        <span>
+            {{ _('Files') }}: {{ result.files }}
+        </span>
+        {% endif %}
+    </div>
+
+    <p>{% if result.content %}{{ result.content|safe }}{% endif %}</p>
+</div>
+
+
+{{ result_footer(result) }}
diff --git a/searx/templates/eelo/result_templates/video_torrent.html b/searx/templates/eelo/result_templates/video_torrent.html
new file mode 100644
index 0000000000000000000000000000000000000000..c108929a75418a737eca27e2edeeab37ac7c3564
--- /dev/null
+++ b/searx/templates/eelo/result_templates/video_torrent.html
@@ -0,0 +1,25 @@
+{% from 'eelo/macros.html' import result_header, result_engine, result_sub_header, format_filesize%}
+
+<div class="result-content">
+    <a class="thumbnail" href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>
+        <img src="{{ url_for('static', filename='img/torrent_thumb.svg') }}" alt="{{ result.title|striptags }} {{ result.engine }}" />
+        <div class="torrent-banner">
+            {{_("torrent")}}
+            <span class="torrent-data">
+                {% if result.seed and result.leech -%}
+                <span>🡑: {{ result.seed }}</span>
+                <span>🡓: {{ result.leech }}</span>
+                {%- endif %}
+                {% if result.filesize %}
+                <span> {{ format_filesize(result.filesize) }} </span>
+                {% endif %}
+            </span>
+        </div>
+    </a>
+    <div>
+        {{ result_header(result, favicons, False) }}
+        {% call result_sub_header(result) -%}
+        {{result_engine(result, favicons)}}
+        {%- endcall %}
+    </div>
+</div>
diff --git a/searx/templates/eelo/result_templates/videos.html b/searx/templates/eelo/result_templates/videos.html
new file mode 100644
index 0000000000000000000000000000000000000000..28f608f87c0a9d08d3ed4b24646b3f811c9212ff
--- /dev/null
+++ b/searx/templates/eelo/result_templates/videos.html
@@ -0,0 +1,13 @@
+{% from 'eelo/macros.html' import result_header, result_engine, result_sub_header%}
+
+<div class="result-content">
+    <a class="thumbnail" href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>
+        <img src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" />
+    </a>
+    <div>
+        {{ result_header(result, favicons, False) }}
+        {% call result_sub_header(result) -%}
+        {{result_engine(result, favicons)}}
+        {%- endcall %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/searx/templates/eelo/results.html b/searx/templates/eelo/results.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf24a44bf6043809a211ced6c1383c69c32481c5
--- /dev/null
+++ b/searx/templates/eelo/results.html
@@ -0,0 +1,152 @@
+{% extends "eelo/base.html" %}
+{% from "eelo/macros.html" import search_link %}
+
+
+{%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&amp;pageno={{ pageno }}{% endif %}{% if time_range %}&amp;time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&amp;language={{ current_language }}{% endif %}{% endmacro -%}
+{% block title %}{{ q|e }} - {% endblock %}
+{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ search_url() }}&amp;format=rss">{% endblock %}
+{% block content %}
+
+    <div id="search_bar_area">
+        {% include 'eelo/components/search_full.html' %}
+    </div>
+
+    {% set use_gallery_layout = selected_category == 'images' or selected_category == 'videos'%}
+    <div class="container contents {% if use_gallery_layout or (not results and not answers) %} full {% endif %}">
+        <div>
+            {% if corrections %}
+            <div class="result" id="corrections">
+                <span class="text-muted">{{ _('Did you mean:') }}
+                    {% for correction in corrections %}
+                    {{ search_link(correction, correction, method) }}
+                    {% endfor %}
+                </span>
+                ?
+            </div>
+            {% endif %}
+
+
+            {% if answers %}
+            {% for answer in answers %}
+            <div class="result well">
+                <span>{{ answer }}</span>
+            </div>
+            {% endfor %}
+            {% endif %}
+
+
+            {% if not results and not answers %}
+                {% include 'eelo/messages/no_results.html' %}
+            {% else %}
+            
+
+                {% macro put_results(results_slice, no_image=False) -%}
+                {%- for result in results_slice %}
+                {% set template = result.template|replace('.html', '') if result['template'] else None %}
+                {% if no_image and template == "images" and not use_gallery_layout %}
+                {% else %}
+                <div class="result {% if template %}result-{{ template }}{% else %} result-default {% endif %}">
+                    {% if template in ["torrent"] and not use_gallery_layout %}
+                    <small class="result-template">{{template}}</small>
+                    {% endif %}
+                    
+                    {% set index = loop.index %}
+                    {% if result.template %}
+                        {# Torrents presented in a gallery like layout are different than the regular layout #}
+                        {% if template == "torrent" and selected_category == 'videos' %}
+                        {% include get_result_template('eelo', 'video_torrent.html') %}
+                        {% else %}
+                        {% include get_result_template('eelo', result['template']) %}
+                        {% endif %}
+                    {% else %}
+                        {% include 'eelo/result_templates/default.html' %}
+                    {% endif %}
+                </div>
+                {% endif %}
+                {%- endfor %}
+                {%- endmacro %}
+
+
+                <div id="results" {% if use_gallery_layout %} class="{{selected_category}}-gallery" {% endif %}>
+                    {{ put_results(results[:3], True) }}
+
+                    {% if image_results %}
+                    <div class="first-page-media-results">
+                        <div class="header">
+                            <b class="title">{{_("Images")}}</b>
+                            {{ search_link(_("More"), q|e, method=method, time_range=time_range, lang=current_language, category="images") }}
+                        </div>
+                        <div id="default_images_container">
+                            {{ put_results(image_results) }}
+                        </div>
+                    </div>
+                    {% endif %}
+                    {% if videos_results %}
+                    <div class="first-page-media-results">
+                        <div class="header">
+                            <b class="title">{{_("Videos")}}</b>
+                            {{ search_link(_("More"), q|e, method=method, time_range=time_range, lang=current_language, category="videos") }}
+                        </div>
+                        <div class="videos-gallery">
+                            {{ put_results(videos_results) }}
+                        </div>
+                    </div>
+                    {% endif %}
+    
+                    {{ put_results(results[4:], True) }}
+                </div>
+
+
+                {% if paging %}
+                {% macro search_form_attrs(pageno) -%}
+                    <input type="hidden" name="category" value="{{selected_category}}">
+                    <input type="hidden" name="q" value="{{ q|e }}" />
+                    <input type="hidden" name="pageno" value="{{ pageno }}" />
+                    <input type="hidden" name="time_range" value="{{ time_range }}" />
+                    <input type="hidden" name="language" value="{{ current_language }}" />
+                {%- endmacro %}
+
+                <div id="pagination" {% if rtl %} class="rtl" {% endif %} >
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
+                        {{ search_form_attrs(pageno - 1) }}
+                        <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-forward"></span> {{ _('previous page') }}</button>
+                    </form>
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
+                        {{ search_form_attrs(pageno + 1) }}
+                        <button type="submit" class="btn primary"><span class="glyphicon glyphicon-backward"></span> {{ _('next page') }}</button>
+                    </form>
+                </div><!-- /#pagination -->
+                {% endif %}
+
+            {% endif %}
+
+        </div>
+
+        <div>
+            {% if errors %}
+            {% from 'eelo/macros.html' import errors_panel %}
+            {{ errors_panel(errors) }}
+            {% endif %}
+            
+            {% if infoboxes %}
+                {% for infobox in infoboxes %}
+                    {% include 'eelo/components/infobox.html' %}
+                {% endfor %}
+            {% endif %}
+
+
+            {% if suggestions %}
+            <div id="suggestions" class="infobox">
+                <h4 class="panel-title">{{ _('Suggestions') }}</h4>
+                <p>
+                    {% for suggestion in suggestions %}
+                    {{ search_link(suggestion, suggestion, method) }}
+                    {% endfor %}
+                </p>
+            </div>
+            {% endif %}
+        </div>
+
+
+    </div>
+{% endblock %}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index ee1052dba06028c5cb648989b449e87efefeab3b..1bca1c84750bc1b9a50fccb48a9949d40c254426 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -36,6 +36,17 @@
             {% endfor %}
             {% endif %}
 
+            {% for result in results_image %}
+            <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
+                {% set index = loop.index %}
+                {% if result.template %}
+                    {% include get_result_template('oscar', result['template']) %}
+                {% else %}
+                    {% include 'oscar/result_templates/default.html' %}
+                {% endif %}
+            </div>
+            {% endfor %}
+
             {% for result in results %}
             <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
                 {% set index = loop.index %}
diff --git a/searx/testing.py b/searx/testing.py
deleted file mode 100644
index 0d17b2a08645f8a15e6a58f069c07f7c4532d119..0000000000000000000000000000000000000000
--- a/searx/testing.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Shared testing code."""
-
-
-import os
-import subprocess
-import traceback
-
-
-from os.path import dirname, join, abspath
-
-from splinter import Browser
-from unittest2 import TestCase
-
-
-class SearxTestLayer:
-    """Base layer for non-robot tests."""
-
-    __name__ = u'SearxTestLayer'
-
-    def setUp(cls):
-        pass
-    setUp = classmethod(setUp)
-
-    def tearDown(cls):
-        pass
-    tearDown = classmethod(tearDown)
-
-    def testSetUp(cls):
-        pass
-    testSetUp = classmethod(testSetUp)
-
-    def testTearDown(cls):
-        pass
-    testTearDown = classmethod(testTearDown)
-
-
-class SearxRobotLayer():
-    """Searx Robot Test Layer"""
-
-    def setUp(self):
-        os.setpgrp()  # create new process group, become its leader
-
-        # get program paths
-        webapp = os.path.join(
-            os.path.abspath(os.path.dirname(os.path.realpath(__file__))),
-            'webapp.py'
-        )
-        exe = 'python'
-
-        # set robot settings path
-        os.environ['SEARX_SETTINGS_PATH'] = abspath(
-            dirname(__file__) + '/settings_robot.yml')
-
-        # run the server
-        self.server = subprocess.Popen(
-            [exe, webapp],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT
-        )
-
-    def tearDown(self):
-        os.kill(self.server.pid, 9)
-        # remove previously set environment variable
-        del os.environ['SEARX_SETTINGS_PATH']
-
-
-# SEARXROBOTLAYER = SearxRobotLayer()
-def run_robot_tests(tests):
-    print('Running {0} tests'.format(len(tests)))
-    for test in tests:
-        with Browser() as browser:
-            test(browser)
-
-
-class SearxTestCase(TestCase):
-    """Base test case for non-robot tests."""
-
-    layer = SearxTestLayer
-
-
-if __name__ == '__main__':
-    import sys
-    # test cases
-    from tests import robot
-
-    base_dir = abspath(join(dirname(__file__), '../tests'))
-    if sys.argv[1] == 'robot':
-        test_layer = SearxRobotLayer()
-        errors = False
-        try:
-            test_layer.setUp()
-            run_robot_tests([getattr(robot, x) for x in dir(robot) if x.startswith('test_')])
-        except Exception:
-            errors = True
-            print('Error occured: {0}'.format(traceback.format_exc()))
-        test_layer.tearDown()
-        sys.exit(1 if errors else 0)
diff --git a/searx/url_utils.py b/searx/url_utils.py
index dcafc3ba817455756a9b9f49a9c65f19c159539a..f349a98d85a56cd35cd3c45425e41d5c6819a268 100644
--- a/searx/url_utils.py
+++ b/searx/url_utils.py
@@ -1,21 +1,15 @@
-from sys import version_info
-
-if version_info[0] == 2:
-    from urllib import quote, quote_plus, unquote, urlencode
-    from urlparse import parse_qs, parse_qsl, urljoin, urlparse, urlunparse, ParseResult
-else:
-    from urllib.parse import (
-        parse_qs,
-        parse_qsl,
-        quote,
-        quote_plus,
-        unquote,
-        urlencode,
-        urljoin,
-        urlparse,
-        urlunparse,
-        ParseResult
-    )
+from urllib.parse import (
+    parse_qs,
+    parse_qsl,
+    quote,
+    quote_plus,
+    unquote,
+    urlencode,
+    urljoin,
+    urlparse,
+    urlunparse,
+    ParseResult
+)
 
 
 __export__ = (parse_qs,
diff --git a/searx/utils.py b/searx/utils.py
index dfa22c5fc0c1a5a54d5acc9a2b2c7215476d2909..a48dc36bf18c08839084ba088d92e56514b2adf0 100644
--- a/searx/utils.py
+++ b/searx/utils.py
@@ -3,14 +3,15 @@ import hashlib
 import hmac
 import os
 import re
+from importlib.machinery import SourceFileLoader
 
 from babel.core import get_global
 from babel.dates import format_date
+from babel import UnknownLocaleError
 from codecs import getincrementalencoder
-from imp import load_source
 from numbers import Number
 from os.path import splitext, join
-from io import open
+from pathlib import Path
 from random import choice
 import sys
 import json
@@ -18,34 +19,19 @@ import json
 from searx import settings
 from searx.version import VERSION_STRING
 from searx.languages import language_codes
-from searx import settings
 from searx import logger
 
-try:
-    from cStringIO import StringIO
-except:
-    from io import StringIO
-
-try:
-    from HTMLParser import HTMLParser
-except:
-    from html.parser import HTMLParser
+from io import StringIO
+from html.parser import HTMLParser
 
-if sys.version_info[0] == 3:
-    unichr = chr
-    unicode = str
-    IS_PY2 = False
-    basestring = str
-else:
-    IS_PY2 = True
 
 logger = logger.getChild('utils')
 
 blocked_tags = ('script',
                 'style')
 
-useragents = json.loads(open(os.path.dirname(os.path.realpath(__file__))
-                             + "/data/useragents.json", 'r', encoding='utf-8').read())
+with open(Path(__file__).parent / "data" / "useragents.json", encoding='utf-8') as fd:
+    useragents = json.load(fd)
 
 
 def searx_useragent():
@@ -67,19 +53,18 @@ def highlight_content(content, query):
     if content.find('<') != -1:
         return content
 
-    query = query.decode('utf-8')
     if content.lower().find(query.lower()) > -1:
-        query_regex = u'({0})'.format(re.escape(query))
+        query_regex = '({0})'.format(re.escape(query))
         content = re.sub(query_regex, '<span class="highlight">\\1</span>',
                          content, flags=re.I | re.U)
     else:
         regex_parts = []
         for chunk in query.split():
             if len(chunk) == 1:
-                regex_parts.append(u'\\W+{0}\\W+'.format(re.escape(chunk)))
+                regex_parts.append('\\W+{0}\\W+'.format(re.escape(chunk)))
             else:
-                regex_parts.append(u'{0}'.format(re.escape(chunk)))
-        query_regex = u'({0})'.format('|'.join(regex_parts))
+                regex_parts.append('{0}'.format(re.escape(chunk)))
+        query_regex = '({0})'.format('|'.join(regex_parts))
         content = re.sub(query_regex, '<span class="highlight">\\1</span>',
                          content, flags=re.I | re.U)
 
@@ -116,11 +101,11 @@ class HTMLTextExtractor(HTMLParser):
     def handle_charref(self, number):
         if not self.is_valid_tag():
             return
-        if number[0] in (u'x', u'X'):
+        if number[0] in ('x', 'X'):
             codepoint = int(number[1:], 16)
         else:
             codepoint = int(number)
-        self.result.append(unichr(codepoint))
+        self.result.append(chr(codepoint))
 
     def handle_entityref(self, name):
         if not self.is_valid_tag():
@@ -130,7 +115,7 @@ class HTMLTextExtractor(HTMLParser):
         self.result.append(name)
 
     def get_text(self):
-        return u''.join(self.result).strip()
+        return ''.join(self.result).strip()
 
 
 def html_to_text(html):
@@ -155,22 +140,14 @@ class UnicodeWriter:
         self.encoder = getincrementalencoder(encoding)()
 
     def writerow(self, row):
-        if IS_PY2:
-            row = [s.encode("utf-8") if hasattr(s, 'encode') else s for s in row]
         self.writer.writerow(row)
         # Fetch UTF-8 output from the queue ...
         data = self.queue.getvalue()
-        if IS_PY2:
-            data = data.decode("utf-8")
-        else:
-            data = data.strip('\x00')
+        data = data.strip('\x00')
         # ... and reencode it into the target encoding
         data = self.encoder.encode(data)
         # write to the target stream
-        if IS_PY2:
-            self.stream.write(data)
-        else:
-            self.stream.write(data.decode("utf-8"))
+        self.stream.write(data)
         # empty queue
         self.queue.truncate(0)
 
@@ -183,7 +160,7 @@ def get_resources_directory(searx_directory, subdirectory, resources_directory):
     if not resources_directory:
         resources_directory = os.path.join(searx_directory, subdirectory)
     if not os.path.isdir(resources_directory):
-        raise Exception(directory + " is not a directory")
+        raise Exception(resources_directory + " is not a directory")
     return resources_directory
 
 
@@ -228,7 +205,7 @@ def format_date_by_locale(date, locale_string):
     # to avoid crashing if locale is not supported by babel
     try:
         formatted_date = format_date(date, locale=locale_string)
-    except:
+    except UnknownLocaleError:
         formatted_date = format_date(date, "YYYY-MM-dd")
 
     return formatted_date
@@ -245,7 +222,7 @@ def dict_subset(d, properties):
 def prettify_url(url, max_length=74):
     if len(url) > max_length:
         chunk_len = int(max_length / 2 + 1)
-        return u'{0}[...]{1}'.format(url[:chunk_len], url[-chunk_len:])
+        return '{0}[...]{1}'.format(url[:chunk_len], url[-chunk_len:])
     else:
         return url
 
@@ -278,7 +255,7 @@ def get_torrent_size(filesize, filesize_multiplier):
             filesize = int(filesize * 1000 * 1000)
         elif filesize_multiplier == 'KiB':
             filesize = int(filesize * 1000)
-    except:
+    except ValueError:
         filesize = None
 
     return filesize
@@ -378,23 +355,20 @@ def load_module(filename, module_dir):
     if modname in sys.modules:
         del sys.modules[modname]
     filepath = join(module_dir, filename)
-    module = load_source(modname, filepath)
+    module = SourceFileLoader(modname, filepath).load_module()
     module.name = modname
     return module
 
 
 def new_hmac(secret_key, url):
-    if sys.version_info[0] == 2:
-        return hmac.new(bytes(secret_key), url, hashlib.sha256).hexdigest()
-    else:
-        return hmac.new(bytes(secret_key, 'utf-8'), url, hashlib.sha256).hexdigest()
+    return hmac.new(bytes(secret_key, 'utf-8'), url, hashlib.sha256).hexdigest()
 
 
 def to_string(obj):
-    if isinstance(obj, basestring):
+    if isinstance(obj, str):
         return obj
     if isinstance(obj, Number):
-        return unicode(obj)
+        return str(obj)
     if hasattr(obj, '__str__'):
         return obj.__str__()
     if hasattr(obj, '__repr__'):
diff --git a/searx/version.py b/searx/version.py
index 4e149722e547a7a4898af9bb1ecc7f9adeb7b930..11bbcbffe0df864ff2f9066fb03d874f7d9b05dd 100644
--- a/searx/version.py
+++ b/searx/version.py
@@ -16,11 +16,15 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 (C) 2013- by Adam Tauber, <asciimoo@gmail.com>
 '''
 
-# version of searx
-VERSION_MAJOR = 0
-VERSION_MINOR = 15
-VERSION_BUILD = 0
+from pkg_resources import get_distribution, DistributionNotFound
 
-VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR,
-                                      VERSION_MINOR,
-                                      VERSION_BUILD)
+try:
+    VERSION_STRING = get_distribution("searx").version
+except DistributionNotFound:
+    VERSION_STRING = "0.0.0"
+
+try:
+    SEARX_VERSION, METADATA_VERSION = VERSION_STRING.split("+")
+except ValueError:
+    SEARX_VERSION = VERSION_STRING
+    METADATA_VERSION = ""
diff --git a/searx/webapp.py b/searx/webapp.py
index 727259774fb88709e0323c356f24a1ff11fb2e88..36f361232f27079328c827d555a5c6725f19f17e 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -17,33 +17,25 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 (C) 2013- by Adam Tauber, <asciimoo@gmail.com>
 '''
 
-if __name__ == '__main__':
-    from sys import path
-    from os.path import realpath, dirname
-    path.append(realpath(dirname(realpath(__file__)) + '/../'))
-
 import hashlib
 import hmac
 import json
 import os
-import sys
+import time
 
 import requests
 
 from searx import logger
-logger = logger.getChild('webapp')
 
-try:
-    from pygments import highlight
-    from pygments.lexers import get_lexer_by_name
-    from pygments.formatters import HtmlFormatter
-except:
-    logger.critical("cannot import dependency: pygments")
-    from sys import exit
-    exit(1)
-from cgi import escape
+
+from pygments import highlight
+from pygments.lexers import get_lexer_by_name
+from pygments.util import ClassNotFound
+from pygments.formatters import HtmlFormatter
+
+from html import escape
 from datetime import datetime, timedelta
-from werkzeug.contrib.fixers import ProxyFix
+from werkzeug.middleware.proxy_fix import ProxyFix
 from flask import (
     Flask, request, render_template, url_for, Response, make_response,
     redirect, send_from_directory
@@ -56,13 +48,14 @@ from searx.engines import (
     categories, engines, engine_shortcuts, get_engines_stats, initialize_engines
 )
 from searx.utils import (
-    UnicodeWriter, highlight_content, html_to_text, get_resources_directory,
+    highlight_content, get_resources_directory,
     get_static_files, get_result_templates, get_themes, gen_useragent,
     dict_subset, prettify_url, match_language
 )
-from searx.version import VERSION_STRING
+from searx.version import VERSION_STRING, SEARX_VERSION, METADATA_VERSION
 from searx.languages import language_codes as languages
-from searx.search import SearchWithPlugins, get_search_query_from_webapp
+from searx.search import Search
+from searx.search_database import RedisCache
 from searx.query import RawTextQuery
 from searx.autocomplete import searx_bang, backends as autocomplete_backends
 from searx.plugins import plugins
@@ -71,29 +64,13 @@ from searx.preferences import Preferences, ValidationException, LANGUAGE_CODES
 from searx.answerers import answerers
 from searx.url_utils import urlencode, urlparse, urljoin
 from searx.utils import new_hmac
-
-# check if the pyopenssl package is installed.
-# It is needed for SSL connection without trouble, see #298
-try:
-    import OpenSSL.SSL  # NOQA
-except ImportError:
-    logger.critical("The pyopenssl package has to be installed.\n"
-                    "Some HTTPS connections will fail")
-
-try:
-    from cStringIO import StringIO
-except:
-    from io import StringIO
-
-
-if sys.version_info[0] == 3:
-    unicode = str
-    PY3 = True
-else:
-    PY3 = False
+import threading
 
 # serve pages with HTTP/1.1
 from werkzeug.serving import WSGIRequestHandler
+
+logger = logger.getChild('webapp')
+
 WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server'].get('http_protocol_version', '1.0'))
 
 # about static
@@ -126,12 +103,14 @@ app.jinja_env.lstrip_blocks = True
 app.secret_key = settings['server']['secret_key']
 
 if not searx_debug \
-   or os.environ.get("WERKZEUG_RUN_MAIN") == "true" \
-   or os.environ.get('UWSGI_ORIGINAL_PROC_NAME') is not None:
+        or os.environ.get("WERKZEUG_RUN_MAIN") == "true" \
+        or os.environ.get('UWSGI_ORIGINAL_PROC_NAME') is not None:
     initialize_engines(settings['engines'])
 
 babel = Babel(app)
 
+search = Search(RedisCache) if settings["redis"]["enable"] else Search()
+
 rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk', 'he',
                'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi']
 
@@ -152,22 +131,26 @@ outgoing_proxies = settings['outgoing'].get('proxies') or None
 
 @babel.localeselector
 def get_locale():
-    locale = request.accept_languages.best_match(settings['locales'].keys())
+    locale = "en-US"
+
+    for lang in request.headers.get("Accept-Language", locale).split(","):
+        locale = match_language(lang, settings['locales'].keys(), fallback=None)
+        if locale is not None:
+            break
+
+    logger.debug("default locale from browser info is `%s`", locale)
 
     if request.preferences.get_value('locale') != '':
         locale = request.preferences.get_value('locale')
 
-    if 'locale' in request.args\
-       and request.args['locale'] in settings['locales']:
-        locale = request.args['locale']
-
-    if 'locale' in request.form\
-       and request.form['locale'] in settings['locales']:
+    if 'locale' in request.form and request.form['locale'] in settings['locales']:
         locale = request.form['locale']
 
     if locale == 'zh_TW':
         locale = 'zh_Hant_TW'
 
+    logger.debug("selected locale is `%s`", locale)
+
     return locale
 
 
@@ -180,7 +163,7 @@ def code_highlighter(codelines, language=None):
     try:
         # find lexer by programing language
         lexer = get_lexer_by_name(language, stripall=True)
-    except:
+    except ClassNotFound:
         # if lexer is not found, using default one
         logger.debug('highlighter cannot find lexer for {0}'.format(language))
         lexer = get_lexer_by_name('text', stripall=True)
@@ -195,9 +178,8 @@ def code_highlighter(codelines, language=None):
             line_code_start = line
 
         # new codeblock is detected
-        if last_line is not None and\
-           last_line + 1 != line:
-
+        if last_line is not None and \
+                last_line + 1 != line:
             # highlight last codepart
             formatter = HtmlFormatter(linenos='inline',
                                       linenostart=line_code_start)
@@ -276,11 +258,11 @@ def proxify(url):
     if not settings.get('result_proxy'):
         return url
 
-    url_params = dict(mortyurl=url.encode('utf-8'))
+    url_params = dict(mortyurl=url)
 
     if settings['result_proxy'].get('key'):
         url_params['mortyhash'] = hmac.new(settings['result_proxy']['key'],
-                                           url.encode('utf-8'),
+                                           url,
                                            hashlib.sha256).hexdigest()
 
     return '{0}?{1}'.format(settings['result_proxy']['url'],
@@ -288,7 +270,6 @@ def proxify(url):
 
 
 def image_proxify(url):
-
     if url.startswith('//'):
         url = 'https:' + url
 
@@ -301,10 +282,10 @@ def image_proxify(url):
     if settings.get('result_proxy'):
         return proxify(url)
 
-    h = new_hmac(settings['server']['secret_key'], url.encode('utf-8'))
+    h = new_hmac(settings['server']['secret_key'], url)
 
     return '{0}?{1}'.format(url_for('image_proxy'),
-                            urlencode(dict(url=url.encode('utf-8'), h=h)))
+                            urlencode(dict(url=url, h=h)))
 
 
 def render(template_name, override_theme=None, **kwargs):
@@ -316,10 +297,11 @@ def render(template_name, override_theme=None, **kwargs):
 
     if 'categories' not in kwargs:
         kwargs['categories'] = ['general']
-        kwargs['categories'].extend(x for x in
-                                    sorted(categories.keys())
-                                    if x != 'general'
-                                    and x in enabled_categories)
+        kwargs["categories"].extend(
+            x
+            for x in sorted(categories.keys())
+            if x != "general" and x in enabled_categories
+        )
 
     if 'all_categories' not in kwargs:
         kwargs['all_categories'] = ['general']
@@ -329,7 +311,7 @@ def render(template_name, override_theme=None, **kwargs):
 
     if 'selected_categories' not in kwargs:
         kwargs['selected_categories'] = []
-        for arg in request.args:
+        for arg in request.form:
             if arg.startswith('category_'):
                 c = arg.split('_', 1)[1]
                 if c in categories:
@@ -346,10 +328,13 @@ def render(template_name, override_theme=None, **kwargs):
     if 'autocomplete' not in kwargs:
         kwargs['autocomplete'] = request.preferences.get_value('autocomplete')
 
-    if get_locale() in rtl_locales and 'rtl' not in kwargs:
+    locale = request.preferences.get_value('locale')
+
+    if locale in rtl_locales and 'rtl' not in kwargs:
         kwargs['rtl'] = True
 
-    kwargs['searx_version'] = VERSION_STRING
+    kwargs['searx_version'] = SEARX_VERSION
+    kwargs['metadata_version'] = METADATA_VERSION
 
     kwargs['method'] = request.preferences.get_value('method')
 
@@ -359,7 +344,7 @@ def render(template_name, override_theme=None, **kwargs):
     if 'current_language' not in kwargs:
         kwargs['current_language'] = match_language(request.preferences.get_value('language'),
                                                     LANGUAGE_CODES,
-                                                    fallback=settings['search']['language'])
+                                                    fallback=locale)
 
     # override url_for function in templates
     kwargs['url_for'] = url_for_theme
@@ -382,7 +367,7 @@ def render(template_name, override_theme=None, **kwargs):
 
     kwargs['results_on_new_tab'] = request.preferences.get_value('results_on_new_tab')
 
-    kwargs['unicode'] = unicode
+    kwargs['unicode'] = str
 
     kwargs['preferences'] = request.preferences
 
@@ -423,185 +408,145 @@ def pre_request():
     else:
         try:
             preferences.parse_dict(request.form)
-        except Exception as e:
+        except Exception:
             logger.exception('invalid settings')
             request.errors.append(gettext('Invalid settings'))
 
+    # init search language and locale
+    locale = get_locale()
+    if not preferences.get_value("language"):
+        preferences.parse_dict({"language": locale})
+    if not preferences.get_value("locale"):
+        preferences.parse_dict({"locale": locale})
+
     # request.user_plugins
     request.user_plugins = []
     allowed_plugins = preferences.plugins.get_enabled()
     disabled_plugins = preferences.plugins.get_disabled()
     for plugin in plugins:
-        if ((plugin.default_on and plugin.id not in disabled_plugins)
-                or plugin.id in allowed_plugins):
+        if (
+            plugin.default_on and plugin.id not in disabled_plugins
+        ) or plugin.id in allowed_plugins:
             request.user_plugins.append(plugin)
 
 
-def index_error(output_format, error_message):
-    if output_format == 'json':
-        return Response(json.dumps({'error': error_message}),
-                        mimetype='application/json')
-    elif output_format == 'csv':
-        response = Response('', mimetype='application/csv')
-        cont_disp = 'attachment;Filename=searx.csv'
-        response.headers.add('Content-Disposition', cont_disp)
-        return response
-    elif output_format == 'rss':
-        response_rss = render(
-            'opensearch_response_rss.xml',
-            results=[],
-            q=request.form['q'] if 'q' in request.form else '',
-            number_of_results=0,
-            base_url=get_base_url(),
-            error_message=error_message,
-            override_theme='__common__',
-        )
-        return Response(response_rss, mimetype='text/xml')
-    else:
-        # html
-        request.errors.append(gettext('search error'))
-        return render(
-            'index.html',
-        )
+def config_results(results, query):
+    for result in results:
+        if 'content' in result and result['content']:
+            result['content'] = highlight_content(escape(result['content'][:1024]), query)
+        result['title'] = highlight_content(escape(result['title'] or ''), query)
+        result['pretty_url'] = prettify_url(result['url'])
+
+        if 'pubdate' in result:
+            publishedDate = datetime.strptime(result['pubdate'], '%Y-%m-%d %H:%M:%S')
+            if publishedDate >= datetime.now() - timedelta(days=1):
+                timedifference = datetime.now() - publishedDate
+                minutes = int((timedifference.seconds / 60) % 60)
+                hours = int(timedifference.seconds / 60 / 60)
+                if hours == 0:
+                    result['publishedDate'] = gettext('{minutes} minute(s) ago').format(minutes=minutes)
+                else:
+                    result['publishedDate'] = gettext('{hours} hour(s), {minutes} minute(s) ago').format(
+                        hours=hours, minutes=minutes)  # noqa
+            else:
+                result['publishedDate'] = format_date(publishedDate)
+
+
+def index_error(exn, output):
+    user_error = gettext("search error")
+    if output == "json":
+        return jsonify({"error": f"{user_error}: {exn}"})
+
+    request.errors.append(user_error)
+    return render('index.html', error_details=exn)
 
 
 @app.route('/search', methods=['GET', 'POST'])
 @app.route('/', methods=['GET', 'POST'])
 def index():
-    """Render index page.
-
-    Supported outputs: html, json, csv, rss.
-    """
-
-    # output_format
-    output_format = request.form.get('format', 'html')
-    if output_format not in ['html', 'csv', 'json', 'rss']:
-        output_format = 'html'
+    # check the response format
+    output = request.form.get("output", "html")
 
     # check if there is query
-    if request.form.get('q') is None:
-        if output_format == 'html':
-            return render(
-                'index.html',
-            )
-        else:
-            return index_error(output_format, 'No query'), 400
-
+    if not request.form.get('q'):
+        if output == 'json':
+            return jsonify({}), 204
+        return render('index.html')
+
+    if request.form.get('category') is None:
+        category = None
+        for name, value in request.form.items():
+            if name.startswith('category_'):
+                category = name[9:]
+                if category in categories and value == "on":
+                    break
+        if category is not None:
+            request.form["category"] = category
+
+    selected_category = request.form.get('category') or 'general'
+    first_page = request.form.get('pageno')
+    is_general_first_page = selected_category == 'general' and (first_page is None or first_page == u'1')
+
+    images = []
+    videos = []
     # search
-    search_query = None
-    result_container = None
+    search_data = None
     try:
-        search_query = get_search_query_from_webapp(request.preferences, request.form)
-        # search = Search(search_query) #  without plugins
-        search = SearchWithPlugins(search_query, request.user_plugins, request)
-        result_container = search.search()
+        if is_general_first_page:
+            request.form['categories'] = ['general', 'videos', 'images']
+        else:
+            request.form['categories'] = [selected_category]
+        search_data = search(request)
+
     except Exception as e:
         # log exception
         logger.exception('search error')
 
         # is it an invalid input parameter or something else ?
-        if (issubclass(e.__class__, SearxParameterException)):
-            return index_error(output_format, e.message), 400
+        if issubclass(e.__class__, SearxParameterException):
+            return index_error(e, output), 400
         else:
-            return index_error(output_format, gettext('search error')), 500
+            return index_error(e, output), 500
 
-    # results
-    results = result_container.get_ordered_results()
-    number_of_results = result_container.results_number()
-    if number_of_results < result_container.results_length():
-        number_of_results = 0
-
-    # UI
-    advanced_search = request.form.get('advanced_search', None)
+    if is_general_first_page:
+        images = [r for r in search_data.results if r.get('category') == 'images'][:5]
+        videos = [r for r in search_data.results if r.get('category') == 'videos'][:2]
+        for res in list(search_data.results):
+            if res.get('category') != 'general':
+                search_data.results.remove(res)
 
     # output
-    for result in results:
-        if output_format == 'html':
-            if 'content' in result and result['content']:
-                result['content'] = highlight_content(escape(result['content'][:1024]), search_query.query)
-            result['title'] = highlight_content(escape(result['title'] or u''), search_query.query)
-        else:
-            if result.get('content'):
-                result['content'] = html_to_text(result['content']).strip()
-            # removing html content and whitespace duplications
-            result['title'] = ' '.join(html_to_text(result['title']).strip().split())
-
-        result['pretty_url'] = prettify_url(result['url'])
-
-        # TODO, check if timezone is calculated right
-        if 'publishedDate' in result:
-            try:  # test if publishedDate >= 1900 (datetime module bug)
-                result['pubdate'] = result['publishedDate'].strftime('%Y-%m-%d %H:%M:%S%z')
-            except ValueError:
-                result['publishedDate'] = None
-            else:
-                if result['publishedDate'].replace(tzinfo=None) >= datetime.now() - timedelta(days=1):
-                    timedifference = datetime.now() - result['publishedDate'].replace(tzinfo=None)
-                    minutes = int((timedifference.seconds / 60) % 60)
-                    hours = int(timedifference.seconds / 60 / 60)
-                    if hours == 0:
-                        result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)
-                    else:
-                        result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)  # noqa
-                else:
-                    result['publishedDate'] = format_date(result['publishedDate'])
-
-    if output_format == 'json':
-        return Response(json.dumps({'query': search_query.query.decode('utf-8'),
-                                    'number_of_results': number_of_results,
-                                    'results': results,
-                                    'answers': list(result_container.answers),
-                                    'corrections': list(result_container.corrections),
-                                    'infoboxes': result_container.infoboxes,
-                                    'suggestions': list(result_container.suggestions),
-                                    'unresponsive_engines': list(result_container.unresponsive_engines)},
-                                   default=lambda item: list(item) if isinstance(item, set) else item),
-                        mimetype='application/json')
-    elif output_format == 'csv':
-        csv = UnicodeWriter(StringIO())
-        keys = ('title', 'url', 'content', 'host', 'engine', 'score')
-        csv.writerow(keys)
-        for row in results:
-            row['host'] = row['parsed_url'].netloc
-            csv.writerow([row.get(key, '') for key in keys])
-        csv.stream.seek(0)
-        response = Response(csv.stream.read(), mimetype='application/csv')
-        cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search_query.query)
-        response.headers.add('Content-Disposition', cont_disp)
-        return response
-    elif output_format == 'rss':
-        response_rss = render(
-            'opensearch_response_rss.xml',
-            results=results,
-            q=request.form['q'],
-            number_of_results=number_of_results,
-            base_url=get_base_url(),
-            override_theme='__common__',
-        )
-        return Response(response_rss, mimetype='text/xml')
-
-    return render(
-        'results.html',
-        results=results,
-        q=request.form['q'],
-        selected_categories=search_query.categories,
-        pageno=search_query.pageno,
-        time_range=search_query.time_range,
-        number_of_results=format_decimal(number_of_results),
-        advanced_search=advanced_search,
-        suggestions=result_container.suggestions,
-        answers=result_container.answers,
-        corrections=result_container.corrections,
-        infoboxes=result_container.infoboxes,
-        paging=result_container.paging,
-        unresponsive_engines=result_container.unresponsive_engines,
-        current_language=match_language(search_query.lang,
+    config_results(search_data.results, search_data.query)
+    config_results(images, search_data.query)
+    config_results(videos, search_data.query)
+
+    response = dict(
+        results=search_data.results,
+        q=search_data.query,
+        selected_category=selected_category,
+        selected_categories=[selected_category],
+        pageno=search_data.pageno,
+        time_range=search_data.time_range,
+        number_of_results=format_decimal(search_data.results_number),
+        advanced_search=request.form.get('advanced_search', None),
+        suggestions=list(search_data.suggestions),
+        answers=list(search_data.answers),
+        corrections=list(search_data.corrections),
+        infoboxes=search_data.infoboxes,
+        paging=search_data.paging,
+        unresponsive_engines=list(search_data.unresponsive_engines),
+        current_language=match_language(search_data.language,
                                         LANGUAGE_CODES,
-                                        fallback=settings['search']['language']),
+                                        fallback=request.preferences.get_value("language")),
+        image_results=images,
+        videos_results=videos,
         base_url=get_base_url(),
         theme=get_current_theme_name(),
         favicons=global_favicons[themes.index(get_current_theme_name())]
     )
+    if output == 'json':
+        return jsonify(response)
+    return render('results.html', **response)
 
 
 @app.route('/about', methods=['GET'])
@@ -612,18 +557,22 @@ def about():
     )
 
 
+@app.route('/privacy', methods=['GET'])
+def privacy():
+    """Render privacy page"""
+    return render(
+        'privacy.html',
+    )
+
+
 @app.route('/autocompleter', methods=['GET', 'POST'])
 def autocompleter():
     """Return autocompleter results"""
-
     # set blocked engines
     disabled_engines = request.preferences.engines.get_disabled()
 
     # parse query
-    if PY3:
-        raw_text_query = RawTextQuery(request.form.get('q', b''), disabled_engines)
-    else:
-        raw_text_query = RawTextQuery(request.form.get('q', u'').encode('utf-8'), disabled_engines)
+    raw_text_query = RawTextQuery(request.form.get('q', ''), disabled_engines)
     raw_text_query.parse_query()
 
     # check if search query is set
@@ -680,7 +629,6 @@ def preferences():
 
     # render preferences
     image_proxy = request.preferences.get_value('image_proxy')
-    lang = request.preferences.get_value('language')
     disabled_engines = request.preferences.engines.get_disabled()
     allowed_plugins = request.preferences.plugins.get_enabled()
 
@@ -706,7 +654,7 @@ def preferences():
 
     return render('preferences.html',
                   locales=settings['locales'],
-                  current_locale=get_locale(),
+                  current_locale=request.preferences.get_value("locale"),
                   image_proxy=image_proxy,
                   engines_by_category=categories,
                   stats=stats,
@@ -726,16 +674,18 @@ def preferences():
 
 
 def _is_selected_language_supported(engine, preferences):
-    language = preferences.get_value('language')
-    return (language == 'all'
-            or match_language(language,
-                              getattr(engine, 'supported_languages', []),
-                              getattr(engine, 'language_aliases', {}), None))
+    language = preferences.get_value("language")
+    return language == "all" or match_language(
+        language,
+        getattr(engine, "supported_languages", []),
+        getattr(engine, "language_aliases", {}),
+        None,
+    )
 
 
 @app.route('/image_proxy', methods=['GET'])
 def image_proxy():
-    url = request.args.get('url').encode('utf-8')
+    url = request.args.get('url')
 
     if not url:
         return '', 400
@@ -781,22 +731,11 @@ def image_proxy():
     return Response(img, mimetype=resp.headers['content-type'], headers=headers)
 
 
-@app.route('/stats', methods=['GET'])
-def stats():
-    """Render engine statistics page."""
-    stats = get_engines_stats()
-    return render(
-        'stats.html',
-        stats=stats,
-    )
-
-
 @app.route('/robots.txt', methods=['GET'])
 def robots():
     return Response("""User-agent: *
 Allow: /
 Allow: /about
-Disallow: /stats
 Disallow: /preferences
 Disallow: /*?*q=*
 """, mimetype='text/plain')
@@ -846,34 +785,41 @@ def clear_cookies():
 
 @app.route('/config')
 def config():
-    return jsonify({'categories': categories.keys(),
-                    'engines': [{'name': engine_name,
-                                 'categories': engine.categories,
-                                 'shortcut': engine.shortcut,
-                                 'enabled': not engine.disabled,
-                                 'paging': engine.paging,
-                                 'language_support': engine.language_support,
-                                 'supported_languages':
-                                 engine.supported_languages.keys()
-                                 if isinstance(engine.supported_languages, dict)
-                                 else engine.supported_languages,
-                                 'safesearch': engine.safesearch,
-                                 'time_range_support': engine.time_range_support,
-                                 'timeout': engine.timeout}
-                                for engine_name, engine in engines.items()],
-                    'plugins': [{'name': plugin.name,
-                                 'enabled': plugin.default_on}
-                                for plugin in plugins],
-                    'instance_name': settings['general']['instance_name'],
-                    'locales': settings['locales'],
-                    'default_locale': settings['ui']['default_locale'],
-                    'autocomplete': settings['search']['autocomplete'],
-                    'safe_search': settings['search']['safe_search'],
-                    'default_theme': settings['ui']['default_theme'],
-                    'version': VERSION_STRING,
-                    'doi_resolvers': [r for r in settings['doi_resolvers']],
-                    'default_doi_resolver': settings['default_doi_resolver'],
-                    })
+    return jsonify(
+        {
+            "categories": list(categories.keys()),
+            "engines": [
+                {
+                    "name": engine_name,
+                    "categories": engine.categories,
+                    "shortcut": engine.shortcut,
+                    "enabled": not engine.disabled,
+                    "paging": engine.paging,
+                    "language_support": engine.language_support,
+                    "supported_languages": list(engine.supported_languages.keys())
+                    if isinstance(engine.supported_languages, dict)
+                    else engine.supported_languages,
+                    "safesearch": engine.safesearch,
+                    "time_range_support": engine.time_range_support,
+                    "timeout": engine.timeout,
+                }
+                for engine_name, engine in engines.items()
+            ],
+            "plugins": [
+                {"name": plugin.name, "enabled": plugin.default_on}
+                for plugin in plugins
+            ],
+            "instance_name": settings["general"]["instance_name"],
+            "locales": settings["locales"],
+            "default_locale": settings["ui"]["default_locale"],
+            "autocomplete": settings["search"]["autocomplete"],
+            "safe_search": settings["search"]["safe_search"],
+            "default_theme": settings["ui"]["default_theme"],
+            "version": VERSION_STRING,
+            "doi_resolvers": [r for r in settings["doi_resolvers"]],
+            "default_doi_resolver": settings["default_doi_resolver"],
+        }
+    )
 
 
 @app.errorhandler(404)
@@ -881,8 +827,37 @@ def page_not_found(e):
     return render('404.html'), 404
 
 
+running = threading.Event()
+
+
+def wait_updating(start_time):
+    wait = settings['redis']['upgrade_history'] - int(time.time() - start_time)
+    if wait > 0:
+        running.wait(wait)
+
+
+def update_results():
+    start_time = time.time()
+    x = 0
+    while not running.is_set():
+        queries = search.cache.get_twenty_queries(x)
+        for query in queries:
+            result_container = search.search(query)
+            searchData = search.create_search_data(query, result_container)
+            search.cache.update(searchData)
+            if running.is_set():
+                return
+        x += len(queries)
+        if len(queries) < 20:
+            x = 0
+            wait_updating(start_time)
+            start_time = time.time()
+
+
 def run():
     logger.debug('starting webserver on %s:%s', settings['server']['port'], settings['server']['bind_address'])
+    threading.Thread(target=update_results, name='results_updater').start()
+    print("engine server starting")
     app.run(
         debug=searx_debug,
         use_debugger=searx_debug,
@@ -890,6 +865,8 @@ def run():
         host=settings['server']['bind_address'],
         threaded=True
     )
+    print("wait for shutdown...")
+    running.set()
 
 
 class ReverseProxyPathFix(object):
diff --git a/setup.py b/setup.py
index 7333551fe664f7e266c55e6942d36e1c60e8dba1..b7f144baa970968e86486e5a38a5ee24015375d0 100644
--- a/setup.py
+++ b/setup.py
@@ -4,27 +4,15 @@
 from setuptools import setup
 from setuptools import find_packages
 
-import os
-import sys
 
-# required to load VERSION_STRING constant
-sys.path.insert(0, './searx')
-from version import VERSION_STRING
-
-
-def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-
-long_description = read('README.rst')
-requirements = map(str.strip, open('requirements.txt').readlines())
-dev_requirements = map(str.strip, open('requirements-dev.txt').readlines())
+requirements = open('requirements.txt').read().splitlines()
+dev_requirements = open('requirements-dev.txt').read().splitlines()
 
 setup(
     name='searx',
-    version=VERSION_STRING,
+    use_scm_version=True,
     description="A privacy-respecting, hackable metasearch engine",
-    long_description=long_description,
+    long_description=open('README.rst').read(),
     classifiers=[
         "Development Status :: 4 - Beta",
         "Programming Language :: Python",
@@ -41,6 +29,7 @@ setup(
     packages=find_packages(exclude=["tests*"]),
     zip_safe=False,
     install_requires=requirements,
+    setup_requires=["setuptools_scm"],
     extras_require={
         'test': dev_requirements
     },
@@ -52,9 +41,6 @@ setup(
     package_data={
         'searx': [
             'settings.yml',
-            '../README.rst',
-            '../requirements.txt',
-            '../requirements-dev.txt',
             'data/*',
             'plugins/*/*',
             'static/*.*',
@@ -64,11 +50,7 @@ setup(
             'static/*/*/*/*/*.*',
             'templates/*/*.*',
             'templates/*/*/*.*',
-            'tests/*',
-            'tests/*/*',
-            'tests/*/*/*',
             'translations/*/*/*'
         ],
     },
-
 )
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
new file mode 100644
index 0000000000000000000000000000000000000000..22fe91e285b78c85ba3672d2a89731c297f763a5
--- /dev/null
+++ b/tests/functional/conftest.py
@@ -0,0 +1,35 @@
+import pytest
+import redis
+import requests
+
+from pytest_dockerc import Wait, Context
+
+
+class SpotContext(Context):
+    @property
+    def url(self):
+        addr = self.container_addr("spot")
+        port = self.container_port("spot")
+        return f"http://{addr}:{port}"
+
+    def wait_for_running_state(self):
+        Wait(ignored_exns=(requests.ConnectionError,), timeout=60)(
+            lambda: requests.get(self.url)
+        )
+
+
+@pytest.fixture(scope="session")
+def ctx(dockerc, dockerc_logs):
+    context = SpotContext(dockerc)
+    context.wait_for_running_state()
+    yield context
+
+
+@pytest.fixture
+def redisdb(ctx):
+    """ purge the db
+    """
+    db = redis.Redis(ctx.container_addr("redis"))
+    for key in db.keys():
+        db.delete(key)
+    yield db
diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
new file mode 100644
index 0000000000000000000000000000000000000000..330bc9ab7cb85c45922174d67a6a0c8afbfb478a
--- /dev/null
+++ b/tests/functional/test_api.py
@@ -0,0 +1,35 @@
+import requests
+
+
+class DataReq(dict):
+    def __init__(self, **kwargs):
+        self["category"] = kwargs.get("category", "general")
+        self["language"] = kwargs.get("language", "en-US")
+        self["q"] = kwargs.get("q", "lequipe.fr")
+        self["time_range"] = kwargs.get("time_range", "")
+        self["output"] = kwargs.get("output", "json")
+
+
+def test_index(ctx, redisdb):
+    """ Test the main endpoint to ensure that some results are returned
+    """
+    res = requests.post(ctx.url)
+    assert res.status_code == 200
+
+    res = requests.post(ctx.url, data={"output": "json"})
+    assert res.status_code == 204
+
+    data = DataReq()
+    res = requests.post(ctx.url, data=data)
+    assert res.status_code == 200
+
+    response = res.json()
+    assert len(response["results"]) > 5
+    assert len(response["image_results"]) == 5
+    assert len(response['videos_results']) == 2
+
+
+def test_config(ctx):
+    res = requests.get(ctx.url + "/config")
+    assert res.status_code == 200
+    assert res.json()["instance_name"] == "/e/ spot"
diff --git a/tests/robot/__init__.py b/tests/robot/__init__.py
deleted file mode 100644
index 038a3196f2ef1b67c11d450db83f1d1601052dd7..0000000000000000000000000000000000000000
--- a/tests/robot/__init__.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from time import sleep
-
-url = "http://localhost:11111/"
-
-
-def test_index(browser):
-    # Visit URL
-    browser.visit(url)
-    assert browser.is_text_present('about')
-
-
-def test_404(browser):
-    # Visit URL
-    browser.visit(url + 'missing_link')
-    assert browser.is_text_present('Page not found')
-
-
-def test_about(browser):
-    browser.visit(url)
-    browser.click_link_by_text('about')
-    assert browser.is_text_present('Why use searx?')
-
-
-def test_preferences(browser):
-    browser.visit(url)
-    browser.click_link_by_text('preferences')
-    assert browser.is_text_present('Preferences')
-    assert browser.is_text_present('Cookies')
-
-    assert browser.is_element_present_by_xpath('//label[@for="checkbox_dummy"]')
-
-
-def test_preferences_engine_select(browser):
-    browser.visit(url)
-    browser.click_link_by_text('preferences')
-
-    assert browser.is_element_present_by_xpath('//a[@href="#tab_engine"]')
-    browser.find_by_xpath('//a[@href="#tab_engine"]').first.click()
-
-    assert not browser.find_by_xpath('//input[@id="engine_general_dummy__general"]').first.checked
-    browser.find_by_xpath('//label[@for="engine_general_dummy__general"]').first.check()
-    browser.find_by_xpath('//input[@value="save"]').first.click()
-
-    # waiting for the redirect - without this the test is flaky..
-    sleep(1)
-
-    browser.visit(url)
-    browser.click_link_by_text('preferences')
-    browser.find_by_xpath('//a[@href="#tab_engine"]').first.click()
-
-    assert browser.find_by_xpath('//input[@id="engine_general_dummy__general"]').first.checked
-
-
-def test_preferences_locale(browser):
-    browser.visit(url)
-    browser.click_link_by_text('preferences')
-
-    browser.select('locale', 'hu')
-    browser.find_by_xpath('//input[@value="save"]').first.click()
-
-    # waiting for the redirect - without this the test is flaky..
-    sleep(1)
-
-    browser.visit(url)
-    browser.click_link_by_text('beállítások')
-    browser.is_text_present('Beállítások')
-
-
-def test_search(browser):
-    browser.visit(url)
-    browser.fill('q', 'test search query')
-    browser.find_by_xpath('//button[@type="submit"]').first.click()
-    assert browser.is_text_present('didn\'t find any results')
diff --git a/tests/test_robot.py b/tests/test_robot.py
deleted file mode 100644
index b48153fe48404a9cb91c546e0c8d77358aeb21e1..0000000000000000000000000000000000000000
--- a/tests/test_robot.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import unittest2 as unittest
-from plone.testing import layered
-from robotsuite import RobotTestSuite
-from searx.testing import SEARXROBOTLAYER
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    current_dir = os.path.abspath(os.path.dirname(__file__))
-    robot_dir = os.path.join(current_dir, 'robot')
-    tests = [
-        os.path.join('robot', f) for f in
-        os.listdir(robot_dir) if f.endswith('.robot') and
-        f.startswith('test_')
-    ]
-    for test in tests:
-        suite.addTests([
-            layered(RobotTestSuite(test), layer=SEARXROBOTLAYER),
-        ])
-    return suite
diff --git a/tests/unit/engines/pubmed.py b/tests/unit/engines/pubmed.py
index 370efe067843cf53d616c8835390ae1657808691..b2a657f93c1eef1cb650f87e708562d8c6ebb7b2 100644
--- a/tests/unit/engines/pubmed.py
+++ b/tests/unit/engines/pubmed.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import pubmed
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestPubmedEngine(SearxTestCase):
+class TestPubmedEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -30,7 +30,7 @@ class TestPubmedEngine(SearxTestCase):
 </IdList></eSearchResult>
 """
 
-        response = mock.Mock(text=xml_mock.encode('utf-8'))
+        response = mock.Mock(text=xml_mock)
         results = pubmed.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
diff --git a/tests/unit/engines/test_acgsou.py b/tests/unit/engines/test_acgsou.py
index c01acf5deb071afa51908851a9c57171c07fd4df..57a800527aba27179b6d1f85ea7b1a1a02928c15 100644
--- a/tests/unit/engines/test_acgsou.py
+++ b/tests/unit/engines/test_acgsou.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import acgsou
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestAcgsouEngine(SearxTestCase):
+class TestAcgsouEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -20,7 +20,7 @@ class TestAcgsouEngine(SearxTestCase):
         resp = mock.Mock(text='<html></html>')
         self.assertEqual(acgsou.response(resp), [])
 
-        html = u"""
+        html = """
         <html>
 <table id="listTable" class="list_style table_fixed">
   <thead class="tcat">
@@ -73,6 +73,6 @@ class TestAcgsouEngine(SearxTestCase):
 
         r = results[0]
         self.assertEqual(r['url'], 'http://www.acgsou.com/show-torrentid.html')
-        self.assertEqual(r['content'], u'Category: "testcategory テスト".')
-        self.assertEqual(r['title'], u'torrentname テスト')
+        self.assertEqual(r['content'], 'Category: "testcategory テスト".')
+        self.assertEqual(r['title'], 'torrentname テスト')
         self.assertEqual(r['filesize'], 1048576)
diff --git a/tests/unit/engines/test_archlinux.py b/tests/unit/engines/test_archlinux.py
index 062f023bd0767241101920d0280f9e0e19c5fe49..1e79cade096a5d0a26a300ac2fa4d782b1f709a1 100644
--- a/tests/unit/engines/test_archlinux.py
+++ b/tests/unit/engines/test_archlinux.py
@@ -1,7 +1,7 @@
 from collections import defaultdict
 import mock
 from searx.engines import archlinux
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 domains = {
     'all': 'https://wiki.archlinux.org',
@@ -13,7 +13,7 @@ domains = {
 }
 
 
-class TestArchLinuxEngine(SearxTestCase):
+class TestArchLinuxEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_arxiv.py b/tests/unit/engines/test_arxiv.py
index b32c0e605a758a762c771e6684a1c80c6b436ad4..0cba7641d904b47f3650055d705e605ca6342490 100644
--- a/tests/unit/engines/test_arxiv.py
+++ b/tests/unit/engines/test_arxiv.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import arxiv
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBaseEngine(SearxTestCase):
+class TestBaseEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_base.py b/tests/unit/engines/test_base.py
index b5da5bde76f616661ad1df15f9a7f7e10464c746..71c560ca6b2526ac7b821d356f52c8937c3fdcf5 100644
--- a/tests/unit/engines/test_base.py
+++ b/tests/unit/engines/test_base.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import base
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBaseEngine(SearxTestCase):
+class TestBaseEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -21,10 +21,10 @@ class TestBaseEngine(SearxTestCase):
         self.assertRaises(AttributeError, base.response, '')
         self.assertRaises(AttributeError, base.response, '[]')
 
-        response = mock.Mock(content=b'<response></response>')
+        response = mock.Mock(content='<response></response>')
         self.assertEqual(base.response(response), [])
 
-        xml_mock = b"""<?xml version="1.0"?>
+        xml_mock = """<?xml version="1.0"?>
 <response>
   <lst name="responseHeader">
     <int name="status">0</int>
diff --git a/tests/unit/engines/test_bing.py b/tests/unit/engines/test_bing.py
index 21191ff2591d1045c711302ecd152a5ebffee6ba..fbaed892fd89d1d418a1f22e6637d1c410977b62 100644
--- a/tests/unit/engines/test_bing.py
+++ b/tests/unit/engines/test_bing.py
@@ -1,18 +1,18 @@
 from collections import defaultdict
 import mock
 from searx.engines import bing
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBingEngine(SearxTestCase):
+class TestBingEngine(TestCase):
 
     def test_request(self):
         bing.supported_languages = ['en', 'fr', 'zh-CHS', 'zh-CHT', 'pt-PT', 'pt-BR']
-        query = u'test_query'
+        query = 'test_query'
         dicto = defaultdict(dict)
         dicto['pageno'] = 0
         dicto['language'] = 'fr-FR'
-        params = bing.request(query.encode('utf-8'), dicto)
+        params = bing.request(query, dicto)
         self.assertTrue('url' in params)
         self.assertTrue(query in params['url'])
         self.assertTrue('language%3AFR' in params['url'])
diff --git a/tests/unit/engines/test_bing_images.py b/tests/unit/engines/test_bing_images.py
index e65e6cc04a7e3a10b2d3e14141774e9c94c73b71..1514a2b6f631879bcb3b1f0d07a170391cd357fa 100644
--- a/tests/unit/engines/test_bing_images.py
+++ b/tests/unit/engines/test_bing_images.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import bing_images
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBingImagesEngine(SearxTestCase):
+class TestBingImagesEngine(TestCase):
 
     def test_request(self):
         bing_images.supported_languages = ['fr-FR', 'en-US']
diff --git a/tests/unit/engines/test_bing_news.py b/tests/unit/engines/test_bing_news.py
index 1155e79c4810460f474a20063792a0eebdd0570a..25379d509d80ab789f60dcd17211184eb8ab982c 100644
--- a/tests/unit/engines/test_bing_news.py
+++ b/tests/unit/engines/test_bing_news.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 import mock
 from searx.engines import bing_news
-from searx.testing import SearxTestCase
+from unittest import TestCase
 import lxml
 
 
-class TestBingNewsEngine(SearxTestCase):
+class TestBingNewsEngine(TestCase):
 
     def test_request(self):
         bing_news.supported_languages = ['en', 'fr']
@@ -37,13 +37,13 @@ class TestBingNewsEngine(SearxTestCase):
         self.assertRaises(AttributeError, bing_news.response, '')
         self.assertRaises(AttributeError, bing_news.response, '[]')
 
-        response = mock.Mock(content='<html></html>')
+        response = mock.Mock(content=b'<html></html>')
         self.assertEqual(bing_news.response(response), [])
 
-        response = mock.Mock(content='<html></html>')
+        response = mock.Mock(content=b'<html></html>')
         self.assertEqual(bing_news.response(response), [])
 
-        html = """<?xml version="1.0" encoding="utf-8" ?>
+        html = b"""<?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:News="https://www.bing.com:443/news/search?q=python&amp;setmkt=en-US&amp;first=1&amp;format=RSS">
     <channel>
         <title>python - Bing News</title>
@@ -75,7 +75,7 @@ class TestBingNewsEngine(SearxTestCase):
         </item>
     </channel>
 </rss>"""  # noqa
-        response = mock.Mock(content=html.encode('utf-8'))
+        response = mock.Mock(content=html)
         results = bing_news.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
@@ -88,7 +88,7 @@ class TestBingNewsEngine(SearxTestCase):
         self.assertEqual(results[1]['content'], 'Another Article Content')
         self.assertNotIn('img_src', results[1])
 
-        html = """<?xml version="1.0" encoding="utf-8" ?>
+        html = b"""<?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:News="https://www.bing.com:443/news/search?q=python&amp;setmkt=en-US&amp;first=1&amp;format=RSS">
     <channel>
         <title>python - Bing News</title>
@@ -114,7 +114,7 @@ class TestBingNewsEngine(SearxTestCase):
         </item>
     </channel>
 </rss>"""  # noqa
-        response = mock.Mock(content=html.encode('utf-8'))
+        response = mock.Mock(content=html)
         results = bing_news.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
@@ -123,7 +123,7 @@ class TestBingNewsEngine(SearxTestCase):
         self.assertEqual(results[0]['content'], 'Article Content')
         self.assertEqual(results[0]['img_src'], 'http://another.bing.com/image')
 
-        html = """<?xml version="1.0" encoding="utf-8" ?>
+        html = b"""<?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:News="https://www.bing.com:443/news/search?q=python&amp;setmkt=en-US&amp;first=1&amp;format=RSS">
     <channel>
         <title>python - Bing News</title>
@@ -137,11 +137,11 @@ class TestBingNewsEngine(SearxTestCase):
     </channel>
 </rss>"""  # noqa
 
-        response = mock.Mock(content=html.encode('utf-8'))
+        response = mock.Mock(content=html)
         results = bing_news.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 0)
 
-        html = """<?xml version="1.0" encoding="utf-8" ?>gabarge"""
-        response = mock.Mock(content=html.encode('utf-8'))
+        html = b"""<?xml version="1.0" encoding="utf-8" ?>gabarge"""
+        response = mock.Mock(content=html)
         self.assertRaises(lxml.etree.XMLSyntaxError, bing_news.response, response)
diff --git a/tests/unit/engines/test_bing_videos.py b/tests/unit/engines/test_bing_videos.py
index 1ae1fad37f5c8ec5018480e8782191e2006475b0..86e8908c28256c3cb3d248f6112526f15f2fd5de 100644
--- a/tests/unit/engines/test_bing_videos.py
+++ b/tests/unit/engines/test_bing_videos.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import bing_videos
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBingVideosEngine(SearxTestCase):
+class TestBingVideosEngine(TestCase):
 
     def test_request(self):
         bing_videos.supported_languages = ['fr-FR', 'en-US']
diff --git a/tests/unit/engines/test_btdigg.py b/tests/unit/engines/test_btdigg.py
index 6a88e3f755607cacf47415ebe48443ebb0d82f59..876388f0fa532dbe335322eb285264d467a226dc 100644
--- a/tests/unit/engines/test_btdigg.py
+++ b/tests/unit/engines/test_btdigg.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import btdigg
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestBtdiggEngine(SearxTestCase):
+class TestBtdiggEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -25,7 +25,7 @@ class TestBtdiggEngine(SearxTestCase):
         response = mock.Mock(text='<html></html>')
         self.assertEqual(btdigg.response(response), [])
 
-        html = u"""
+        html = """
         <div id="search_res">
             <table>
                 <tr>
@@ -82,7 +82,7 @@ class TestBtdiggEngine(SearxTestCase):
             </table>
         </div>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = btdigg.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
@@ -101,12 +101,12 @@ class TestBtdiggEngine(SearxTestCase):
             </table>
         </div>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = btdigg.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 0)
 
-        html = u"""
+        html = """
         <div id="search_res">
             <table>
                 <tr>
@@ -367,7 +367,7 @@ class TestBtdiggEngine(SearxTestCase):
             </table>
         </div>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = btdigg.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 5)
diff --git a/tests/unit/engines/test_currency_convert.py b/tests/unit/engines/test_currency_convert.py
index fec19410390c12c51782991ca0fb8f92c8761610..ae7aa88b01bc9452b8dfd3f0d85661b18a48e86c 100644
--- a/tests/unit/engines/test_currency_convert.py
+++ b/tests/unit/engines/test_currency_convert.py
@@ -2,19 +2,19 @@ from collections import defaultdict
 from datetime import datetime
 import mock
 from searx.engines import currency_convert
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestCurrencyConvertEngine(SearxTestCase):
+class TestCurrencyConvertEngine(TestCase):
 
     def test_request(self):
-        query = b'test_query'
+        query = 'test_query'
         dicto = defaultdict(dict)
         dicto['pageno'] = 1
         params = currency_convert.request(query, dicto)
         self.assertNotIn('url', params)
 
-        query = b'convert 10 Pound Sterlings to United States Dollars'
+        query = 'convert 10 Pound Sterlings to United States Dollars'
         params = currency_convert.request(query, dicto)
         self.assertIn('url', params)
         self.assertIn('duckduckgo.com', params['url'])
@@ -48,8 +48,11 @@ class TestCurrencyConvertEngine(SearxTestCase):
         results = currency_convert.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['answer'], '10.0 GBP = 5.0 USD, 1 GBP (pound sterling)' +
-                         ' = 0.5 USD (United States dollar)')
+        self.assertEqual(
+            results[0]['answer'],
+            ('10.0 GBP = 5.0 USD, 1 GBP (pound sterling)'
+             ' = 0.5 USD (United States dollar)')
+        )
 
         target_url = 'https://duckduckgo.com/js/spice/currency/1/{}/{}'.format(
             dicto['from'], dicto['to'])
diff --git a/tests/unit/engines/test_dailymotion.py b/tests/unit/engines/test_dailymotion.py
index ad7f3d2835a98fee5e1d888b08a4f89a56fdb3d0..1811b9ad41a4d84130fba0a16c1455fb179c27bb 100644
--- a/tests/unit/engines/test_dailymotion.py
+++ b/tests/unit/engines/test_dailymotion.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import dailymotion
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDailymotionEngine(SearxTestCase):
+class TestDailymotionEngine(TestCase):
 
     def test_request(self):
         dailymotion.supported_languages = ['en', 'fr']
@@ -107,6 +107,6 @@ class TestDailymotionEngine(SearxTestCase):
 
         self.assertEqual(languages['af']['name'], 'Afrikaans')
         self.assertEqual(languages['af']['english_name'], 'Afrikaans')
-        self.assertEqual(languages['ar']['name'], u'العربية')
+        self.assertEqual(languages['ar']['name'], 'العربية')
         self.assertEqual(languages['ar']['english_name'], 'Arabic')
         self.assertEqual(languages['la']['english_name'], 'Latin')
diff --git a/tests/unit/engines/test_deezer.py b/tests/unit/engines/test_deezer.py
index 5b9f55c331d8f665ce6471f78f3b8b5cad3b00f0..aaa1af90710385162de4234a858071510f51e615 100644
--- a/tests/unit/engines/test_deezer.py
+++ b/tests/unit/engines/test_deezer.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import deezer
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDeezerEngine(SearxTestCase):
+class TestDeezerEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_deviantart.py b/tests/unit/engines/test_deviantart.py
index bd2cf182f861ddf1ba750c1b1797d5448321a3ac..729718512e5a47eeaebe8c0a97384dca41af2401 100644
--- a/tests/unit/engines/test_deviantart.py
+++ b/tests/unit/engines/test_deviantart.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import deviantart
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDeviantartEngine(SearxTestCase):
+class TestDeviantartEngine(TestCase):
 
     def test_request(self):
         dicto = defaultdict(dict)
diff --git a/tests/unit/engines/test_digbt.py b/tests/unit/engines/test_digbt.py
index 31c2ecabb32adc3c25b491a3c1040319ffbe8f68..88401b6ede70264708f11f4c6efc34217dffbf25 100644
--- a/tests/unit/engines/test_digbt.py
+++ b/tests/unit/engines/test_digbt.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import digbt
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDigBTEngine(SearxTestCase):
+class TestDigBTEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -50,7 +50,7 @@ class TestDigBTEngine(SearxTestCase):
             </td></tr>
         </table>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = digbt.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
diff --git a/tests/unit/engines/test_digg.py b/tests/unit/engines/test_digg.py
index 6e7c9cc991e662f1066a42e3c09696d36d933761..2ce61a019b5d1d796215ab41deb8a1df5aa0961c 100644
--- a/tests/unit/engines/test_digg.py
+++ b/tests/unit/engines/test_digg.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import digg
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDiggEngine(SearxTestCase):
+class TestDiggEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_doku.py b/tests/unit/engines/test_doku.py
index 22ddb7a7f5e7df3dc9b52a50365d26eeb6af0ac1..af5b4802fbd8cb100a0f7cfed3dff7679a84ba6c 100644
--- a/tests/unit/engines/test_doku.py
+++ b/tests/unit/engines/test_doku.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import doku
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDokuEngine(SearxTestCase):
+class TestDokuEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -23,7 +23,7 @@ class TestDokuEngine(SearxTestCase):
         response = mock.Mock(text='<html></html>')
         self.assertEqual(doku.response(response), [])
 
-        html = u"""
+        html = """
         <div class="search_quickresult">
             <h3>Pages trouvées :</h3>
             <ul class="search_quickhits">
@@ -37,7 +37,7 @@ class TestDokuEngine(SearxTestCase):
         expected = [{'content': '', 'title': 'xfconf-query', 'url': 'http://localhost:8090/xfconf-query'}]
         self.assertEqual(doku.response(response), expected)
 
-        html = u"""
+        html = """
         <dl class="search_results">
             <dt><a href="/xvnc?s[]=query" class="wikilink1" title="xvnc">xvnc</a>: 40 Occurrences trouvées</dt>
             <dd>er = /usr/bin/Xvnc
diff --git a/tests/unit/engines/test_duckduckgo.py b/tests/unit/engines/test_duckduckgo.py
index eb316a4042344b18bfe4750805ebec4578190924..03ad258d4e593ac79fcf2b0518dcfb980f030146 100644
--- a/tests/unit/engines/test_duckduckgo.py
+++ b/tests/unit/engines/test_duckduckgo.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import load_engine, duckduckgo
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDuckduckgoEngine(SearxTestCase):
+class TestDuckduckgoEngine(TestCase):
 
     def test_request(self):
         duckduckgo = load_engine({'engine': 'duckduckgo', 'name': 'duckduckgo'})
@@ -53,7 +53,7 @@ class TestDuckduckgoEngine(SearxTestCase):
         response = mock.Mock(text='<html></html>')
         self.assertEqual(duckduckgo.response(response), [])
 
-        html = u"""
+        html = """
         <div class="result results_links results_links_deep web-result result--no-result">
             <div class="links_main links_deep result__body">
                 <h2 class="result__title">
@@ -68,7 +68,7 @@ class TestDuckduckgoEngine(SearxTestCase):
         results = duckduckgo.response(response)
         self.assertEqual(duckduckgo.response(response), [])
 
-        html = u"""
+        html = """
         <div class="result results_links results_links_deep web-result ">
             <div class="links_main links_deep result__body">
                 <h2 class="result__title">
@@ -89,7 +89,7 @@ class TestDuckduckgoEngine(SearxTestCase):
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0]['title'], 'This is the title')
-        self.assertEqual(results[0]['url'], u'http://this.should.be.the.link/ű')
+        self.assertEqual(results[0]['url'], 'http://this.should.be.the.link/ű')
         self.assertEqual(results[0]['content'], 'This should be the content.')
 
     def test_fetch_supported_languages(self):
diff --git a/tests/unit/engines/test_duckduckgo_definitions.py b/tests/unit/engines/test_duckduckgo_definitions.py
index 37587ed8dd6d3643542e18b2c584817b6560f9c0..2c432a5b8d052ebbf56ee18e7ac5c18d420ff977 100644
--- a/tests/unit/engines/test_duckduckgo_definitions.py
+++ b/tests/unit/engines/test_duckduckgo_definitions.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import duckduckgo_definitions
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDDGDefinitionsEngine(SearxTestCase):
+class TestDDGDefinitionsEngine(TestCase):
 
     def test_result_to_text(self):
         url = ''
diff --git a/tests/unit/engines/test_duckduckgo_images.py b/tests/unit/engines/test_duckduckgo_images.py
index 0d152bec14091980ef8b0fdf5648dc1e7f1cf86f..a22ae6547697e5d142388d0e9bf5d6d6349ce297 100644
--- a/tests/unit/engines/test_duckduckgo_images.py
+++ b/tests/unit/engines/test_duckduckgo_images.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import duckduckgo_images
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDuckduckgoImagesEngine(SearxTestCase):
+class TestDuckduckgoImagesEngine(TestCase):
 
     def test_request(self):
         duckduckgo_images.supported_languages = ['de-CH', 'en-US']
@@ -43,7 +43,7 @@ class TestDuckduckgoImagesEngine(SearxTestCase):
         response = mock.Mock(text='If this error persists, please let us know: ops@duckduckgo.com')
         self.assertRaises(Exception, duckduckgo_images.response, response)
 
-        json = u"""
+        json = """
         {
             "query": "test_query",
             "results": [
diff --git a/tests/unit/engines/test_duden.py b/tests/unit/engines/test_duden.py
index d9bbfef8b7cd228ce1bb9a3a26be1b84d9f80dab..44cd17014b59ba8a04020e6f58d41ef5dc25eef1 100644
--- a/tests/unit/engines/test_duden.py
+++ b/tests/unit/engines/test_duden.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 import mock
 from searx.engines import duden
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from datetime import datetime
 
 
-class TestDudenEngine(SearxTestCase):
+class TestDudenEngine(TestCase):
 
     def test_request(self):
         query = 'Haus'
diff --git a/tests/unit/engines/test_dummy.py b/tests/unit/engines/test_dummy.py
index 9399beaaf70ed31136ef2f4384a9cecf2cd9b6ec..7fe1d0a4e4b5744ecf26e74022b5b3cb78c7bc9a 100644
--- a/tests/unit/engines/test_dummy.py
+++ b/tests/unit/engines/test_dummy.py
@@ -1,8 +1,8 @@
 from searx.engines import dummy
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestDummyEngine(SearxTestCase):
+class TestDummyEngine(TestCase):
 
     def test_request(self):
         test_params = [
diff --git a/tests/unit/engines/test_faroo.py b/tests/unit/engines/test_faroo.py
index 1bd9f51c3cfa31dcd0fa01559214f1de90caf55a..177f9fdb7fa51698b1c2cdb7a70e0bb677a6c59a 100644
--- a/tests/unit/engines/test_faroo.py
+++ b/tests/unit/engines/test_faroo.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import faroo
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFarooEngine(SearxTestCase):
+class TestFarooEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_fdroid.py b/tests/unit/engines/test_fdroid.py
index d75f4f0b48053c45efc32f5d3033ea7db71709bd..f7ca46297ba99c329a03ec18da720f140f9e2cf6 100644
--- a/tests/unit/engines/test_fdroid.py
+++ b/tests/unit/engines/test_fdroid.py
@@ -1,10 +1,10 @@
 import mock
 from collections import defaultdict
 from searx.engines import fdroid
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFdroidEngine(SearxTestCase):
+class TestFdroidEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_flickr.py b/tests/unit/engines/test_flickr.py
index be97647ce7834a2b31b03c578f801622f61628d6..12fcbc248518ac61026fd195e1542614349db03c 100644
--- a/tests/unit/engines/test_flickr.py
+++ b/tests/unit/engines/test_flickr.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import flickr
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFlickrEngine(SearxTestCase):
+class TestFlickrEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_flickr_noapi.py b/tests/unit/engines/test_flickr_noapi.py
index 5f8b069e3faacf6169986e43698dc84dcd40dd4d..3fa4e7eba6fb1f3aaab1c72a861104aff596d87a 100644
--- a/tests/unit/engines/test_flickr_noapi.py
+++ b/tests/unit/engines/test_flickr_noapi.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import flickr_noapi
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFlickrNoapiEngine(SearxTestCase):
+class TestFlickrNoapiEngine(TestCase):
 
     def test_build_flickr_url(self):
         url = flickr_noapi.build_flickr_url("uid", "pid")
diff --git a/tests/unit/engines/test_framalibre.py b/tests/unit/engines/test_framalibre.py
index 850996372660c51fcbe270c25fcfdf50b2e35e85..fe8402c5429ba7cac08fc42850ef2541edfb7799 100644
--- a/tests/unit/engines/test_framalibre.py
+++ b/tests/unit/engines/test_framalibre.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import framalibre
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFramalibreEngine(SearxTestCase):
+class TestFramalibreEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -28,7 +28,7 @@ class TestFramalibreEngine(SearxTestCase):
         response = mock.Mock(text='{"data": []}')
         self.assertEqual(framalibre.response(response), [])
 
-        html = u"""
+        html = """
         <div class="nodes-list-row">
           <div id="node-431"
               class="node node-logiciel-annuaires node-promoted node-teaser node-teaser node-sheet clearfix nodes-list"
@@ -100,4 +100,4 @@ class TestFramalibreEngine(SearxTestCase):
         self.assertEqual(results[0]['url'],
                          'https://framalibre.org/content/gogs')
         self.assertEqual(results[0]['content'],
-                         u"Gogs est une interface web basée sur git et une bonne alternative à GitHub.")
+                         "Gogs est une interface web basée sur git et une bonne alternative à GitHub.")
diff --git a/tests/unit/engines/test_frinkiac.py b/tests/unit/engines/test_frinkiac.py
index 5ea220cd35ff98967777b51fea01c4325dba1325..97fe1f72e7d29de96aa30807b392d50c131343b4 100644
--- a/tests/unit/engines/test_frinkiac.py
+++ b/tests/unit/engines/test_frinkiac.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import frinkiac
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestFrinkiacEngine(SearxTestCase):
+class TestFrinkiacEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -42,7 +42,7 @@ class TestFrinkiacEngine(SearxTestCase):
         results = frinkiac.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 4)
-        self.assertEqual(results[0]['title'], u'S06E18')
+        self.assertEqual(results[0]['title'], 'S06E18')
         self.assertIn('p=caption', results[0]['url'])
         self.assertIn('e=S06E18', results[0]['url'])
         self.assertIn('t=534616', results[0]['url'])
diff --git a/tests/unit/engines/test_genius.py b/tests/unit/engines/test_genius.py
index ea721943a1b08f1cfeff1159893ebbdd7c6b4dde..31c33e47f2fc03b103a3ab344d9ceea210705790 100644
--- a/tests/unit/engines/test_genius.py
+++ b/tests/unit/engines/test_genius.py
@@ -2,10 +2,10 @@ from collections import defaultdict
 import mock
 from datetime import datetime
 from searx.engines import genius
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGeniusEngine(SearxTestCase):
+class TestGeniusEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_gigablast.py b/tests/unit/engines/test_gigablast.py
index 6b2d26458a763dd937e8bda746767a6cd4cb2f60..6d1931d23a35aa5a4703d7ba92a3e1ad22808114 100644
--- a/tests/unit/engines/test_gigablast.py
+++ b/tests/unit/engines/test_gigablast.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import gigablast
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGigablastEngine(SearxTestCase):
+class TestGigablastEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_github.py b/tests/unit/engines/test_github.py
index 460be8c3df89f3da38e9491d42c440a111eafde9..6983ca9b7aaedb6822d9159903840217f0db60eb 100644
--- a/tests/unit/engines/test_github.py
+++ b/tests/unit/engines/test_github.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import github
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGitHubEngine(SearxTestCase):
+class TestGitHubEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_google.py b/tests/unit/engines/test_google.py
index a73e9d2be52b22dff310ea49cc31ee20dd0938ef..77e535af630b36f4209a546e4cb99f994c412404 100644
--- a/tests/unit/engines/test_google.py
+++ b/tests/unit/engines/test_google.py
@@ -3,10 +3,10 @@ from collections import defaultdict
 import mock
 import lxml
 from searx.engines import google
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGoogleEngine(SearxTestCase):
+class TestGoogleEngine(TestCase):
 
     def mock_response(self, text):
         response = mock.Mock(text=text, url='https://www.google.com/search?q=test&start=0&gbv=1&gws_rd=cr')
@@ -202,7 +202,7 @@ class TestGoogleEngine(SearxTestCase):
         self.assertEqual(type(languages), dict)
         self.assertEqual(len(languages), 0)
 
-        html = u"""
+        html = """
         <html>
             <body>
                 <div id="langSec">
@@ -224,14 +224,14 @@ class TestGoogleEngine(SearxTestCase):
         self.assertIn('zh-CN', languages)
         self.assertIn('zh-TW', languages)
 
-        self.assertEquals(type(languages['en']), dict)
-        self.assertEquals(type(languages['zh-CN']), dict)
-        self.assertEquals(type(languages['zh-TW']), dict)
+        self.assertEqual(type(languages['en']), dict)
+        self.assertEqual(type(languages['zh-CN']), dict)
+        self.assertEqual(type(languages['zh-TW']), dict)
 
         self.assertIn('name', languages['en'])
         self.assertIn('name', languages['zh-CN'])
         self.assertIn('name', languages['zh-TW'])
 
-        self.assertEquals(languages['en']['name'], 'English')
-        self.assertEquals(languages['zh-CN']['name'], u'中文 (简体)')
-        self.assertEquals(languages['zh-TW']['name'], u'中文 (繁體)')
+        self.assertEqual(languages['en']['name'], 'English')
+        self.assertEqual(languages['zh-CN']['name'], '中文 (简体)')
+        self.assertEqual(languages['zh-TW']['name'], '中文 (繁體)')
diff --git a/tests/unit/engines/test_google_images.py b/tests/unit/engines/test_google_images.py
index 8366e1b0883d93c4bcd6547af3b1d6cb609eae8c..7a1fcb9febcfca0c5ed878fc189a7cbb4636ad00 100644
--- a/tests/unit/engines/test_google_images.py
+++ b/tests/unit/engines/test_google_images.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import google_images
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGoogleImagesEngine(SearxTestCase):
+class TestGoogleImagesEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_google_news.py b/tests/unit/engines/test_google_news.py
index 0a122ca6d8eb86fe1e6f30641364f3894dfbf875..6a4b6bfbcfbd87e359efcc252268482282c29928 100644
--- a/tests/unit/engines/test_google_news.py
+++ b/tests/unit/engines/test_google_news.py
@@ -3,10 +3,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import google_news
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGoogleNewsEngine(SearxTestCase):
+class TestGoogleNewsEngine(TestCase):
 
     def test_request(self):
         google_news.supported_languages = ['en-US', 'fr-FR']
@@ -38,7 +38,7 @@ class TestGoogleNewsEngine(SearxTestCase):
         response = mock.Mock(text='{"data": []}')
         self.assertEqual(google_news.response(response), [])
 
-        html = u"""
+        html = """
 <h2 class="hd">Search Results</h2>
 <div data-async-context="query:searx" id="ires">
     <div eid="oC2oWcGXCafR6ASkwoCwDA" id="rso">
@@ -93,10 +93,10 @@ class TestGoogleNewsEngine(SearxTestCase):
         results = google_news.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['title'], u'Example title')
+        self.assertEqual(results[0]['title'], 'Example title')
         self.assertEqual(results[0]['url'], 'https://example.com/')
         self.assertEqual(results[0]['content'], 'Example description')
-        self.assertEqual(results[1]['title'], u'Example title 2')
+        self.assertEqual(results[1]['title'], 'Example title 2')
         self.assertEqual(results[1]['url'], 'https://example2.com/')
         self.assertEqual(results[1]['content'], 'Example description 2')
         self.assertEqual(results[1]['img_src'], 'https://example2.com/image.jpg')
diff --git a/tests/unit/engines/test_google_videos.py b/tests/unit/engines/test_google_videos.py
index 3b7edf37306b710cc224ed3a4212569f50e71f4e..fcb3893fb980f9d794bc75547f09888331e88baf 100644
--- a/tests/unit/engines/test_google_videos.py
+++ b/tests/unit/engines/test_google_videos.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import google_videos
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestGoogleVideosEngine(SearxTestCase):
+class TestGoogleVideosEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -71,9 +71,9 @@ class TestGoogleVideosEngine(SearxTestCase):
         results = google_videos.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['url'], u'url_1')
-        self.assertEqual(results[0]['title'], u'Title 1')
-        self.assertEqual(results[0]['content'], u'Content 1')
-        self.assertEqual(results[1]['url'], u'url_2')
-        self.assertEqual(results[1]['title'], u'Title 2')
-        self.assertEqual(results[1]['content'], u'Content 2')
+        self.assertEqual(results[0]['url'], 'url_1')
+        self.assertEqual(results[0]['title'], 'Title 1')
+        self.assertEqual(results[0]['content'], 'Content 1')
+        self.assertEqual(results[1]['url'], 'url_2')
+        self.assertEqual(results[1]['title'], 'Title 2')
+        self.assertEqual(results[1]['content'], 'Content 2')
diff --git a/tests/unit/engines/test_ina.py b/tests/unit/engines/test_ina.py
index 109a9592dd91075b3dc9786a15c4a22fc2e62ec4..074dd0e9cdac0b7fe90162c58274cf879fea515b 100644
--- a/tests/unit/engines/test_ina.py
+++ b/tests/unit/engines/test_ina.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import ina
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestInaEngine(SearxTestCase):
+class TestInaEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -56,9 +56,9 @@ class TestInaEngine(SearxTestCase):
         results = ina.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], u'Conf\xe9rence de presse du G\xe9n\xe9ral de Gaulle')
+        self.assertEqual(results[0]['title'], 'Conf\xe9rence de presse du G\xe9n\xe9ral de Gaulle')
         self.assertEqual(results[0]['url'],
                          'https://www.ina.fr/video/CAF89035682/conference-de-presse-du-general-de-gaulle-video.html')
         self.assertEqual(results[0]['content'],
-                         u"VERSION INTEGRALE DE LA CONFERENCE DE PRESSE DU GENERAL DE GAULLE ."
-                         u" - PA le Pr\u00e9sident DE GAULLE : il ouvre les bras et s'assied. DP journalis...")
+                         "VERSION INTEGRALE DE LA CONFERENCE DE PRESSE DU GENERAL DE GAULLE ."
+                         " - PA le Pr\u00e9sident DE GAULLE : il ouvre les bras et s'assied. DP journalis...")
diff --git a/tests/unit/engines/test_kickass.py b/tests/unit/engines/test_kickass.py
index 3a75c66974ebc8855998e95aa7e27ee575a6cab1..ba2239a139144fb0a24c899716f47852bee45052 100644
--- a/tests/unit/engines/test_kickass.py
+++ b/tests/unit/engines/test_kickass.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import kickass
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestKickassEngine(SearxTestCase):
+class TestKickassEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_mediawiki.py b/tests/unit/engines/test_mediawiki.py
index b86372700f1f63bd0994359f2cc7786f49273fc9..a5cab24bca1f754bb26606cda77794a5de7fb08e 100644
--- a/tests/unit/engines/test_mediawiki.py
+++ b/tests/unit/engines/test_mediawiki.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import mediawiki
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestMediawikiEngine(SearxTestCase):
+class TestMediawikiEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -75,7 +75,7 @@ class TestMediawikiEngine(SearxTestCase):
         results = mediawiki.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], u'This is the title étude')
+        self.assertEqual(results[0]['title'], 'This is the title étude')
         self.assertIn('fr.wikipedia.org', results[0]['url'])
         self.assertIn('This_is_the_title', results[0]['url'])
         self.assertIn('%C3%A9tude', results[0]['url'])
diff --git a/tests/unit/engines/test_mixcloud.py b/tests/unit/engines/test_mixcloud.py
index 9c79a478e2537573de057c11301890b66c8d7f4e..ccde14dc0bcd5974c7e77d1caa05e1174e48963b 100644
--- a/tests/unit/engines/test_mixcloud.py
+++ b/tests/unit/engines/test_mixcloud.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import mixcloud
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestMixcloudEngine(SearxTestCase):
+class TestMixcloudEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_nyaa.py b/tests/unit/engines/test_nyaa.py
index 6dcafc6b712226387f2dce677c7075108bef279e..a017d9621aaea44f6aad50ed7303a0d512e5d8f5 100644
--- a/tests/unit/engines/test_nyaa.py
+++ b/tests/unit/engines/test_nyaa.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import nyaa
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestNyaaEngine(SearxTestCase):
+class TestNyaaEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_openstreetmap.py b/tests/unit/engines/test_openstreetmap.py
index 7b7783f040fa3527aeecc18db7f7eac4a961911b..f85fabe326629f95b928e98c031ff905e5a9b54d 100644
--- a/tests/unit/engines/test_openstreetmap.py
+++ b/tests/unit/engines/test_openstreetmap.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import openstreetmap
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestOpenstreetmapEngine(SearxTestCase):
+class TestOpenstreetmapEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_pdbe.py b/tests/unit/engines/test_pdbe.py
index ea5adf9dcf211444757f3d37a2f7890b7c81fc5e..6558a9245ebe4aea0e575dfb780bd152875ff5b5 100644
--- a/tests/unit/engines/test_pdbe.py
+++ b/tests/unit/engines/test_pdbe.py
@@ -1,10 +1,10 @@
 import mock
 from collections import defaultdict
 from searx.engines import pdbe
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestPdbeEngine(SearxTestCase):
+class TestPdbeEngine(TestCase):
     def test_request(self):
         query = 'test_query'
         dicto = defaultdict(dict)
diff --git a/tests/unit/engines/test_photon.py b/tests/unit/engines/test_photon.py
index 7344978845381335843ad378911aaf5f62e85c68..f86b1c4801fdc08cc008e6c5f18e98c27fb2482d 100644
--- a/tests/unit/engines/test_photon.py
+++ b/tests/unit/engines/test_photon.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import photon
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestPhotonEngine(SearxTestCase):
+class TestPhotonEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -158,7 +158,7 @@ class TestPhotonEngine(SearxTestCase):
         self.assertEqual(results[0]['osm']['id'], 114823817)
         self.assertEqual(results[0]['url'], 'https://openstreetmap.org/way/114823817')
         self.assertEqual(results[1]['osm']['type'], 'relation')
-        self.assertEqual(results[2]['address']['name'], u'Bibliothèque')
+        self.assertEqual(results[2]['address']['name'], 'Bibliothèque')
         self.assertEqual(results[2]['address']['house_number'], None)
         self.assertEqual(results[2]['address']['locality'], 'Paris')
         self.assertEqual(results[2]['address']['postcode'], '75001')
diff --git a/tests/unit/engines/test_piratebay.py b/tests/unit/engines/test_piratebay.py
index 89a78e79653fba5632543c5572cadfdc8f1c10d9..1d985f9cc901da29795e5b969b32a856a2d9672d 100644
--- a/tests/unit/engines/test_piratebay.py
+++ b/tests/unit/engines/test_piratebay.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import piratebay
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestPiratebayEngine(SearxTestCase):
+class TestPiratebayEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_qwant.py b/tests/unit/engines/test_qwant.py
index 6611264f8fcd4d80d176299af858591246473821..3fbd76eb520ffd9978c4331a740e4b7cc04b0334 100644
--- a/tests/unit/engines/test_qwant.py
+++ b/tests/unit/engines/test_qwant.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import qwant
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestQwantEngine(SearxTestCase):
+class TestQwantEngine(TestCase):
 
     def test_request(self):
         qwant.supported_languages = ['en-US', 'fr-CA', 'fr-FR']
diff --git a/tests/unit/engines/test_reddit.py b/tests/unit/engines/test_reddit.py
index 9c94f4e2b70343b33415857952fbbb474cb1a632..53e25f5ee8c0f70d826f6d1aeae6fea55953bf81 100644
--- a/tests/unit/engines/test_reddit.py
+++ b/tests/unit/engines/test_reddit.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 import mock
 from searx.engines import reddit
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from datetime import datetime
 
 
-class TestRedditEngine(SearxTestCase):
+class TestRedditEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_scanr_structures.py b/tests/unit/engines/test_scanr_structures.py
index a7b9e91858bccdb8eea88c1b00444056bc1a74ef..04e442a16e9a7247ed7710082cd7c101bf89e449 100644
--- a/tests/unit/engines/test_scanr_structures.py
+++ b/tests/unit/engines/test_scanr_structures.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import scanr_structures
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestScanrStructuresEngine(SearxTestCase):
+class TestScanrStructuresEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -27,7 +27,7 @@ class TestScanrStructuresEngine(SearxTestCase):
         response = mock.Mock(text='{"data": []}')
         self.assertEqual(scanr_structures.response(response), [])
 
-        json = u"""
+        json = """
         {
           "request":
             {
@@ -159,12 +159,12 @@ class TestScanrStructuresEngine(SearxTestCase):
         results = scanr_structures.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['title'], u"Laboratoire d'Informatique de Grenoble")
+        self.assertEqual(results[0]['title'], "Laboratoire d'Informatique de Grenoble")
         self.assertEqual(results[0]['url'], 'https://scanr.enseignementsup-recherche.gouv.fr/structure/200711886U')
         self.assertEqual(results[0]['content'],
-                         u"linguicielles d\xe9velopp\xe9s jusqu'ici par le GETALP "
-                         u"du LIG en tant que prototypes "
-                         u"op\xe9rationnels. Dans le contexte")
+                         "linguicielles d\xe9velopp\xe9s jusqu'ici par le GETALP "
+                         "du LIG en tant que prototypes "
+                         "op\xe9rationnels. Dans le contexte")
         self.assertEqual(results[1]['img_src'],
                          'https://scanr.enseignementsup-recherche.gouv.fr//static/logos/199511665F.png')
         self.assertEqual(results[1]['content'],
@@ -172,4 +172,4 @@ class TestScanrStructuresEngine(SearxTestCase):
                          " triple-exponential bounds for "
                          "choosability problems parameterized")
         self.assertEqual(results[1]['url'], 'https://scanr.enseignementsup-recherche.gouv.fr/structure/199511665F')
-        self.assertEqual(results[1]['title'], u"Laboratoire Bordelais de Recherche en Informatique")
+        self.assertEqual(results[1]['title'], "Laboratoire Bordelais de Recherche en Informatique")
diff --git a/tests/unit/engines/test_searchcode_code.py b/tests/unit/engines/test_searchcode_code.py
index 955aea111e3df2bf2cd0f2222cab9c18d1d2206c..911c0dd2274a6cb2ab41f697a0976424716639bd 100644
--- a/tests/unit/engines/test_searchcode_code.py
+++ b/tests/unit/engines/test_searchcode_code.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import searchcode_code
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestSearchcodeCodeEngine(SearxTestCase):
+class TestSearchcodeCodeEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_searchcode_doc.py b/tests/unit/engines/test_searchcode_doc.py
index d02bb7a441b1127df6e7442d0eae6cfa004f3542..cda9fd4afe30f05599e2bf940948e1963bb84589 100644
--- a/tests/unit/engines/test_searchcode_doc.py
+++ b/tests/unit/engines/test_searchcode_doc.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import searchcode_doc
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestSearchcodeDocEngine(SearxTestCase):
+class TestSearchcodeDocEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_soundcloud.py b/tests/unit/engines/test_soundcloud.py
index 3077d3b4b4dc3d8b18fbbeacba932636ad1b1e6e..bf06965badb0c06b03b8c341083d3acb3f5ec679 100644
--- a/tests/unit/engines/test_soundcloud.py
+++ b/tests/unit/engines/test_soundcloud.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 import mock
 from searx.engines import soundcloud
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from searx.url_utils import quote_plus
 
 
-class TestSoundcloudEngine(SearxTestCase):
+class TestSoundcloudEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_spotify.py b/tests/unit/engines/test_spotify.py
index e37c344d2154df6809b86b472b0c3f22c47eea5c..aaed5176374f7aa206505e39ee2cd78725e9b942 100644
--- a/tests/unit/engines/test_spotify.py
+++ b/tests/unit/engines/test_spotify.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import spotify
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestSpotifyEngine(SearxTestCase):
+class TestSpotifyEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_stackoverflow.py b/tests/unit/engines/test_stackoverflow.py
index 18a1ff4bdb9e9df92e8b243658c149a15d84ac11..f71920bc55f7d9316216d076105b2ab5f694bd98 100644
--- a/tests/unit/engines/test_stackoverflow.py
+++ b/tests/unit/engines/test_stackoverflow.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import stackoverflow
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestStackoverflowEngine(SearxTestCase):
+class TestStackoverflowEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_startpage.py b/tests/unit/engines/test_startpage.py
index a4704ce220424c9fe3e66f4a4e72c82e29ded6d4..b598bbec6a5d80cc4b24e65e69eb7dcd2c4940ad 100644
--- a/tests/unit/engines/test_startpage.py
+++ b/tests/unit/engines/test_startpage.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import startpage
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestStartpageEngine(SearxTestCase):
+class TestStartpageEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -62,7 +62,7 @@ class TestStartpageEngine(SearxTestCase):
             </p>
         </li>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = startpage.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
@@ -133,7 +133,7 @@ class TestStartpageEngine(SearxTestCase):
             </p>
         </li>
         """
-        response = mock.Mock(text=html.encode('utf-8'))
+        response = mock.Mock(text=html)
         results = startpage.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
diff --git a/tests/unit/engines/test_tokyotoshokan.py b/tests/unit/engines/test_tokyotoshokan.py
index b5c6fad17b25b358cf8592e0856a90b737db5977..991b43ea215f4d77c62baf4ea54bebe76fcaad0d 100644
--- a/tests/unit/engines/test_tokyotoshokan.py
+++ b/tests/unit/engines/test_tokyotoshokan.py
@@ -1,11 +1,11 @@
 import mock
 from collections import defaultdict
 from searx.engines import tokyotoshokan
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from datetime import datetime
 
 
-class TestTokyotoshokanEngine(SearxTestCase):
+class TestTokyotoshokanEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_torrentz.py b/tests/unit/engines/test_torrentz.py
index f483bf68cc2175ff0387228235c55c69f4447935..35256a81310b599267f08d4fac458cdbdc275ada 100644
--- a/tests/unit/engines/test_torrentz.py
+++ b/tests/unit/engines/test_torrentz.py
@@ -1,11 +1,11 @@
 import mock
 from collections import defaultdict
 from searx.engines import torrentz
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from datetime import datetime
 
 
-class TestTorrentzEngine(SearxTestCase):
+class TestTorrentzEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_twitter.py b/tests/unit/engines/test_twitter.py
index b444b48eeec1fc9be624995191820cfa24c11171..0cdd9320ada5e630f7545ffdf650def0622efef8 100644
--- a/tests/unit/engines/test_twitter.py
+++ b/tests/unit/engines/test_twitter.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import twitter
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestTwitterEngine(SearxTestCase):
+class TestTwitterEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -250,7 +250,7 @@ class TestTwitterEngine(SearxTestCase):
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0]['title'], '@TitleName')
         self.assertEqual(results[0]['url'], 'https://twitter.com/this.is.the.url')
-        self.assertIn(u'This is the content', results[0]['content'])
+        self.assertIn('This is the content', results[0]['content'])
         # self.assertIn(u'This is the content étude à€', results[0]['content'])
 
         html = """
@@ -472,7 +472,7 @@ class TestTwitterEngine(SearxTestCase):
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0]['title'], '@TitleName')
         self.assertEqual(results[0]['url'], 'https://twitter.com/this.is.the.url')
-        self.assertIn(u'This is the content', results[0]['content'])
+        self.assertIn('This is the content', results[0]['content'])
 
         html = """
         <li class="b_algo" u="0|5109|4755453613245655|UAGjXgIrPH5yh-o5oNHRx_3Zta87f_QO">
diff --git a/tests/unit/engines/test_unsplash.py b/tests/unit/engines/test_unsplash.py
index 4501de9063ac5efbb2c36c77673488d75c0b14dc..197579cfcf80ab74360a8c00df94c929e53200c4 100644
--- a/tests/unit/engines/test_unsplash.py
+++ b/tests/unit/engines/test_unsplash.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from searx.engines import unsplash
 
 
-class TestUnsplashEngine(SearxTestCase):
+class TestUnsplashEngine(TestCase):
     def test_request(self):
         query = 'penguin'
         _dict = defaultdict(dict)
@@ -31,8 +31,10 @@ class TestUnsplashEngine(SearxTestCase):
         self.assertEqual(len(result), 2)
         self.assertEqual(result[0]['title'], 'low angle photography of swimming penguin')
         self.assertEqual(result[0]['url'], 'https://unsplash.com/photos/FY8d721UO_4')
-        self.assertEqual(result[0]['thumbnail_src'], 'https://images.unsplash.com/photo-1523557148507-1b77641c7e7c?ixlib=rb-0.3.5&q=80\
-&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max')
+        self.assertEqual(result[0]['thumbnail_src'], (
+            'https://images.unsplash.com/photo-1523557148507-1b77641c7e7c?ixlib=rb-0.3.5&q=80'
+            '&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max'
+        ))
         self.assertEqual(result[0]['img_src'], 'https://images.unsplash.com/photo-1523557148507-1b77641c7e7c\
 ?ixlib=rb-0.3.5')
         self.assertEqual(result[0]['content'], '')
diff --git a/tests/unit/engines/test_vimeo.py b/tests/unit/engines/test_vimeo.py
index c86b50a1479cd1cf3792bb4ae6d9c72beed0d014..ac492094afdfca49684110a221b42319e06d3ef4 100644
--- a/tests/unit/engines/test_vimeo.py
+++ b/tests/unit/engines/test_vimeo.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import vimeo
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestVimeoEngine(SearxTestCase):
+class TestVimeoEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -22,7 +22,7 @@ class TestVimeoEngine(SearxTestCase):
         self.assertRaises(AttributeError, vimeo.response, '')
         self.assertRaises(AttributeError, vimeo.response, '[]')
 
-        json = u"""
+        json = """
 {"filtered":{"total":274641,"page":1,"per_page":18,"paging":{"next":"?sizes=590x332&page=2","previous":null,"first":"?sizes=590x332&page=1","last":"?sizes=590x332&page=15258"},"data":[{"is_staffpick":false,"is_featured":true,"type":"clip","clip":{"uri":"\\/videos\\/106557563","name":"Hot Rod Revue: The South","link":"https:\\/\\/vimeo.com\\/106557563","duration":4069,"created_time":"2014-09-19T03:38:04+00:00","privacy":{"view":"ptv"},"pictures":{"sizes":[{"width":"590","height":"332","link":"https:\\/\\/i.vimeocdn.com\\/video\\/489717884_590x332.jpg?r=pad","link_with_play_button":"https:\\/\\/i.vimeocdn.com\\/filter\\/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F489717884_590x332.jpg&src1=http%3A%2F%2Ff.vimeocdn.com%2Fp%2Fimages%2Fcrawler_play.png"}]},"stats":{"plays":null},"metadata":{"connections":{"comments":{"total":0},"likes":{"total":5}},"interactions":[]},"user":{"name":"Cal Thorley","link":"https:\\/\\/vimeo.com\\/calthorley","pictures":{"sizes":[{"width":30,"height":30,"link":"https:\\/\\/i.vimeocdn.com\\/portrait\\/2545308_30x30?r=pad"},{"width":75,"height":75,"link":"https:\\/\\/i.vimeocdn.com\\/portrait\\/2545308_75x75?r=pad"},{"width":100,"height":100,"link":"https:\\/\\/i.vimeocdn.com\\/portrait\\/2545308_100x100?r=pad"},{"width":300,"height":300,"link":"https:\\/\\/i.vimeocdn.com\\/portrait\\/2545308_300x300?r=pad"}]}}}}]}};
 
 """  # noqa
@@ -30,7 +30,7 @@ class TestVimeoEngine(SearxTestCase):
         results = vimeo.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['title'], u'Hot Rod Revue: The South')
+        self.assertEqual(results[0]['title'], 'Hot Rod Revue: The South')
         self.assertEqual(results[0]['url'], 'https://vimeo.com/106557563')
         self.assertEqual(results[0]['content'], '')
         self.assertEqual(results[0]['thumbnail'], 'https://i.vimeocdn.com/video/489717884_590x332.jpg?r=pad')
diff --git a/tests/unit/engines/test_wikidata.py b/tests/unit/engines/test_wikidata.py
index 347defb71a944bd98ef3f73345cb8e3928afc690..543cc32cb972444080a2b37a39cba92e82bac396 100644
--- a/tests/unit/engines/test_wikidata.py
+++ b/tests/unit/engines/test_wikidata.py
@@ -3,10 +3,10 @@ from lxml.html import fromstring
 from collections import defaultdict
 import mock
 from searx.engines import wikidata
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestWikidataEngine(SearxTestCase):
+class TestWikidataEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -110,7 +110,7 @@ class TestWikidataEngine(SearxTestCase):
         image_src = wikidata.add_image(fromstring("<div></div>"))
         self.assertEqual(image_src, None)
 
-        html = u"""
+        html = """
         <div>
             <div id="P18">
                 <div class="wikibase-statementgroupview-property-label">
@@ -144,7 +144,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertEqual(image_src,
                          "https://commons.wikimedia.org/wiki/Special:FilePath/image.png?width=500&height=400")
 
-        html = u"""
+        html = """
         <div>
             <div id="P2910">
                 <div class="wikibase-statementgroupview-property-label">
@@ -203,7 +203,7 @@ class TestWikidataEngine(SearxTestCase):
                          "https://commons.wikimedia.org/wiki/Special:FilePath/logo.png?width=500&height=400")
 
     def test_add_attribute(self):
-        html = u"""
+        html = """
         <div>
             <div id="P27">
                 <div class="wikibase-statementgroupview-property-label">
@@ -241,7 +241,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertEqual(attributes[0]["label"], "Country of citizenship")
         self.assertEqual(attributes[0]["value"], "United Kingdom")
 
-        html = u"""
+        html = """
         <div>
             <div id="P569">
                 <div class="wikibase-statementgroupview-property-label">
@@ -276,7 +276,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertEqual(attributes[0]["label"], "Date of birth")
         self.assertEqual(attributes[0]["value"], "27 January 1832")
 
-        html = u"""
+        html = """
         <div>
             <div id="P6">
                 <div class="wikibase-statementgroupview-property-label">
@@ -331,7 +331,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertEqual(attributes[0]["value"], "Actual Prime Minister")
 
     def test_add_url(self):
-        html = u"""
+        html = """
         <div>
             <div id="P856">
                 <div class="wikibase-statementgroupview-property-label">
@@ -358,17 +358,17 @@ class TestWikidataEngine(SearxTestCase):
         urls = []
         html_etree = fromstring(html)
         wikidata.add_url(urls, html_etree, 'P856')
-        self.assertEquals(len(urls), 1)
+        self.assertEqual(len(urls), 1)
         self.assertIn({'title': 'Official website', 'url': 'https://searx.me/'}, urls)
         urls = []
         results = []
         wikidata.add_url(urls, html_etree, 'P856', 'custom label', results=results)
-        self.assertEquals(len(urls), 1)
-        self.assertEquals(len(results), 1)
+        self.assertEqual(len(urls), 1)
+        self.assertEqual(len(results), 1)
         self.assertIn({'title': 'custom label', 'url': 'https://searx.me/'}, urls)
         self.assertIn({'title': 'custom label', 'url': 'https://searx.me/'}, results)
 
-        html = u"""
+        html = """
         <div>
             <div id="P856">
                 <div class="wikibase-statementgroupview-property-label">
@@ -406,12 +406,12 @@ class TestWikidataEngine(SearxTestCase):
         urls = []
         html_etree = fromstring(html)
         wikidata.add_url(urls, html_etree, 'P856')
-        self.assertEquals(len(urls), 2)
+        self.assertEqual(len(urls), 2)
         self.assertIn({'title': 'Official website', 'url': 'http://www.worldofwarcraft.com'}, urls)
         self.assertIn({'title': 'Official website', 'url': 'http://eu.battle.net/wow/en/'}, urls)
 
     def test_get_imdblink(self):
-        html = u"""
+        html = """
         <div>
             <div class="wikibase-statementview-mainsnak">
                 <div>
@@ -427,7 +427,7 @@ class TestWikidataEngine(SearxTestCase):
         html_etree = fromstring(html)
         imdblink = wikidata.get_imdblink(html_etree, 'https://www.imdb.com/')
 
-        html = u"""
+        html = """
         <div>
             <div class="wikibase-statementview-mainsnak">
                 <div>
@@ -446,7 +446,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertIn('https://www.imdb.com/name/nm4915994', imdblink)
 
     def test_get_geolink(self):
-        html = u"""
+        html = """
         <div>
             <div class="wikibase-statementview-mainsnak">
                 <div>
@@ -462,7 +462,7 @@ class TestWikidataEngine(SearxTestCase):
         self.assertIn('https://www.openstreetmap.org/', geolink)
         self.assertIn('lat=60&lon=40', geolink)
 
-        html = u"""
+        html = """
         <div>
             <div class="wikibase-statementview-mainsnak">
                 <div>
diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py
index 316b12bc557203acfb82f466e46c6b4648cca0dd..89f6326f71f5454e39ed39b1c1c52a7e1eef88c7 100644
--- a/tests/unit/engines/test_wikipedia.py
+++ b/tests/unit/engines/test_wikipedia.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import wikipedia
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestWikipediaEngine(SearxTestCase):
+class TestWikipediaEngine(TestCase):
 
     def test_request(self):
         wikipedia.supported_languages = ['fr', 'en', 'no']
@@ -14,15 +14,15 @@ class TestWikipediaEngine(SearxTestCase):
         query = 'test_query'
         dicto = defaultdict(dict)
         dicto['language'] = 'fr-FR'
-        params = wikipedia.request(query.encode('utf-8'), dicto)
+        params = wikipedia.request(query, dicto)
         self.assertIn('url', params)
         self.assertIn(query, params['url'])
         self.assertIn('test_query', params['url'])
         self.assertIn('Test_Query', params['url'])
         self.assertIn('fr.wikipedia.org', params['url'])
 
-        query = u'Test_Query'
-        params = wikipedia.request(query.encode('utf-8'), dicto)
+        query = 'Test_Query'
+        params = wikipedia.request(query, dicto)
         self.assertIn('Test_Query', params['url'])
         self.assertNotIn('test_query', params['url'])
 
@@ -88,9 +88,9 @@ class TestWikipediaEngine(SearxTestCase):
         results = wikipedia.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['title'], u'The Title')
+        self.assertEqual(results[0]['title'], 'The Title')
         self.assertIn('fr.wikipedia.org/wiki/The_Title', results[0]['url'])
-        self.assertEqual(results[1]['infobox'], u'The Title')
+        self.assertEqual(results[1]['infobox'], 'The Title')
         self.assertIn('fr.wikipedia.org/wiki/The_Title', results[1]['id'])
         self.assertIn('The Title is...', results[1]['content'])
         self.assertEqual(results[1]['img_src'], 'img_src.jpg')
@@ -142,7 +142,7 @@ class TestWikipediaEngine(SearxTestCase):
         self.assertEqual(results[1]['img_src'], None)
 
         # title not in first paragraph
-        json = u"""
+        json = """
         {
             "batchcomplete": "",
             "query": {
@@ -166,17 +166,17 @@ class TestWikipediaEngine(SearxTestCase):
         results = wikipedia.response(response)
         self.assertEqual(type(results), list)
         self.assertEqual(len(results), 2)
-        self.assertEqual(results[1]['infobox'], u'披頭四樂隊')
-        self.assertIn(u'披头士乐队...', results[1]['content'])
+        self.assertEqual(results[1]['infobox'], '披頭四樂隊')
+        self.assertIn('披头士乐队...', results[1]['content'])
 
     def test_fetch_supported_languages(self):
-        html = u"""<html></html>"""
+        html = """<html></html>"""
         response = mock.Mock(text=html)
         languages = wikipedia._fetch_supported_languages(response)
         self.assertEqual(type(languages), dict)
         self.assertEqual(len(languages), 0)
 
-        html = u"""
+        html = """
         <html>
             <body>
                 <div>
@@ -258,6 +258,6 @@ class TestWikipediaEngine(SearxTestCase):
         self.assertEqual(languages['ceb']['name'], 'Sinugboanong Binisaya')
         self.assertEqual(languages['ceb']['english_name'], 'Cebuano')
         self.assertEqual(languages['ceb']['articles'], 3000000)
-        self.assertEqual(languages['no']['name'], u'Norsk (Bokmål)')
-        self.assertEqual(languages['no']['english_name'], u'Norwegian (Bokmål)')
+        self.assertEqual(languages['no']['name'], 'Norsk (Bokmål)')
+        self.assertEqual(languages['no']['english_name'], 'Norwegian (Bokmål)')
         self.assertEqual(languages['no']['articles'], 100000)
diff --git a/tests/unit/engines/test_wolframalpha_api.py b/tests/unit/engines/test_wolframalpha_api.py
index 0433b34aabf78609d5d28a57c021a09fe63fcf24..a28330e1995e5f3d5d9751ef6ea15b10ce424765 100644
--- a/tests/unit/engines/test_wolframalpha_api.py
+++ b/tests/unit/engines/test_wolframalpha_api.py
@@ -3,10 +3,10 @@ from collections import defaultdict
 import mock
 from requests import Request
 from searx.engines import wolframalpha_api
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestWolframAlphaAPIEngine(SearxTestCase):
+class TestWolframAlphaAPIEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
@@ -20,7 +20,7 @@ class TestWolframAlphaAPIEngine(SearxTestCase):
         self.assertEqual('https://www.wolframalpha.com/input/?i=test_query', params['headers']['Referer'])
 
     def test_replace_pua_chars(self):
-        self.assertEqual('i', wolframalpha_api.replace_pua_chars(u'\uf74e'))
+        self.assertEqual('i', wolframalpha_api.replace_pua_chars('\uf74e'))
 
     def test_response(self):
         self.assertRaises(AttributeError, wolframalpha_api.response, None)
@@ -32,10 +32,10 @@ class TestWolframAlphaAPIEngine(SearxTestCase):
         request = Request(headers={'Referer': referer_url})
 
         # test failure
-        xml = '''<?xml version='1.0' encoding='UTF-8'?>
+        xml = b'''<?xml version='1.0' encoding='UTF-8'?>
         <queryresult success='false' error='false' />
         '''
-        response = mock.Mock(content=xml.encode('utf-8'))
+        response = mock.Mock(content=xml)
         self.assertEqual(wolframalpha_api.response(response), [])
 
         # test basic case
diff --git a/tests/unit/engines/test_wolframalpha_noapi.py b/tests/unit/engines/test_wolframalpha_noapi.py
index 982edd9f2fb0f942da8d7214ca33dec38061925e..d60ed0625642a3c4171b09f511272a281f384044 100644
--- a/tests/unit/engines/test_wolframalpha_noapi.py
+++ b/tests/unit/engines/test_wolframalpha_noapi.py
@@ -3,10 +3,10 @@ from collections import defaultdict
 import mock
 from requests import Request
 from searx.engines import wolframalpha_noapi
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestWolframAlphaNoAPIEngine(SearxTestCase):
+class TestWolframAlphaNoAPIEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_www1x.py b/tests/unit/engines/test_www1x.py
index 9df8de6bf5906ae1debc78fc91b97aaa490dc4ab..67081a3a592cf4b0dd96451657ca87897e01b709 100644
--- a/tests/unit/engines/test_www1x.py
+++ b/tests/unit/engines/test_www1x.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import www1x
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestWww1xEngine(SearxTestCase):
+class TestWww1xEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_yacy.py b/tests/unit/engines/test_yacy.py
index f49532cf44b58725c7836b148af4c4e896cc4fe7..c769a026f3dbe9c7811f3b1ffae35945b15e696c 100644
--- a/tests/unit/engines/test_yacy.py
+++ b/tests/unit/engines/test_yacy.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import yacy
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestYacyEngine(SearxTestCase):
+class TestYacyEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_yahoo.py b/tests/unit/engines/test_yahoo.py
index e52c1109ec3306b64f80ee594a2bf1237a5a37b3..d2eb22e1e6e6675d759abe014fd9b6ec8b6988f5 100644
--- a/tests/unit/engines/test_yahoo.py
+++ b/tests/unit/engines/test_yahoo.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import yahoo
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestYahooEngine(SearxTestCase):
+class TestYahooEngine(TestCase):
 
     def test_parse_url(self):
         test_url = 'http://r.search.yahoo.com/_ylt=A0LEb9JUSKcAEGRXNyoA;_ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb' +\
diff --git a/tests/unit/engines/test_yahoo_news.py b/tests/unit/engines/test_yahoo_news.py
index ae27df2a56e09746d8858367627cd2afa3e89b79..03ac0ac66efcec0041a7e0dffd11d6643ae24f11 100644
--- a/tests/unit/engines/test_yahoo_news.py
+++ b/tests/unit/engines/test_yahoo_news.py
@@ -3,10 +3,10 @@ from collections import defaultdict
 from datetime import datetime
 import mock
 from searx.engines import yahoo_news
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestYahooNewsEngine(SearxTestCase):
+class TestYahooNewsEngine(TestCase):
 
     def test_request(self):
         yahoo_news.supported_languages = ['en', 'fr']
diff --git a/tests/unit/engines/test_youtube_api.py b/tests/unit/engines/test_youtube_api.py
index 0d4d478c3bbb9d46e977c688ed1f48aaa5428440..789d8b1943391b0a7bf1a759087247d7e0076227 100644
--- a/tests/unit/engines/test_youtube_api.py
+++ b/tests/unit/engines/test_youtube_api.py
@@ -1,10 +1,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import youtube_api
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestYoutubeAPIEngine(SearxTestCase):
+class TestYoutubeAPIEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/engines/test_youtube_noapi.py b/tests/unit/engines/test_youtube_noapi.py
index cbf7b9bcd2888ebbaa2d8a4b3682921b15ccdc4b..6eb428a88c36b51cf3ed7ab503bd7a0340f14c7a 100644
--- a/tests/unit/engines/test_youtube_noapi.py
+++ b/tests/unit/engines/test_youtube_noapi.py
@@ -2,10 +2,10 @@
 from collections import defaultdict
 import mock
 from searx.engines import youtube_noapi
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestYoutubeNoAPIEngine(SearxTestCase):
+class TestYoutubeNoAPIEngine(TestCase):
 
     def test_request(self):
         query = 'test_query'
diff --git a/tests/unit/test_answerers.py b/tests/unit/test_answerers.py
index bd8789a7e4ae3e5b5f61f5c878b66e8a07de65c1..756edc37d95f7c131a04ae00f03951de1a057f3d 100644
--- a/tests/unit/test_answerers.py
+++ b/tests/unit/test_answerers.py
@@ -3,14 +3,14 @@
 from mock import Mock
 
 from searx.answerers import answerers
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class AnswererTest(SearxTestCase):
+class AnswererTest(TestCase):
 
     def test_unicode_input(self):
         query = Mock()
-        unicode_payload = u'árvíztűrő tükörfúrógép'
+        unicode_payload = 'árvíztűrő tükörfúrógép'
         for answerer in answerers:
-            query.query = u'{} {}'.format(answerer.keywords[0], unicode_payload)
+            query.query = '{} {}'.format(answerer.keywords[0], unicode_payload)
             self.assertTrue(isinstance(answerer.answer(query), list))
diff --git a/tests/unit/test_plugins.py b/tests/unit/test_plugins.py
index e497371f8c92c7f2bccfff86eb5d71ee3f9b044c..729b8fc912408257f69ebfe110332f7e5a63c00f 100644
--- a/tests/unit/test_plugins.py
+++ b/tests/unit/test_plugins.py
@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from searx import plugins
 from mock import Mock
 
 
 def get_search_mock(query, **kwargs):
-    return Mock(search_query=Mock(query=query, **kwargs),
-                result_container=Mock(answers=set()))
+    return Mock(query=query, answers=set(), **kwargs)
 
 
-class PluginStoreTest(SearxTestCase):
+class PluginStoreTest(TestCase):
 
     def test_PluginStore_init(self):
         store = plugins.PluginStore()
@@ -37,7 +36,7 @@ class PluginStoreTest(SearxTestCase):
         self.assertTrue(testplugin.asdf.called)
 
 
-class SelfIPTest(SearxTestCase):
+class SelfIPTest(TestCase):
 
     def test_PluginStore_init(self):
         store = plugins.PluginStore()
@@ -48,38 +47,38 @@ class SelfIPTest(SearxTestCase):
         # IP test
         request = Mock(remote_addr='127.0.0.1')
         request.headers.getlist.return_value = []
-        search = get_search_mock(query=b'ip', pageno=1)
+        search = get_search_mock(query='ip', pageno=1)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertTrue('127.0.0.1' in search.result_container.answers)
+        self.assertTrue('127.0.0.1' in search.answers)
 
-        search = get_search_mock(query=b'ip', pageno=2)
+        search = get_search_mock(query='ip', pageno=2)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertFalse('127.0.0.1' in search.result_container.answers)
+        self.assertFalse('127.0.0.1' in search.answers)
 
         # User agent test
         request = Mock(user_agent='Mock')
         request.headers.getlist.return_value = []
 
-        search = get_search_mock(query=b'user-agent', pageno=1)
+        search = get_search_mock(query='user-agent', pageno=1)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertTrue('Mock' in search.result_container.answers)
+        self.assertTrue('Mock' in search.answers)
 
-        search = get_search_mock(query=b'user-agent', pageno=2)
+        search = get_search_mock(query='user-agent', pageno=2)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertFalse('Mock' in search.result_container.answers)
+        self.assertFalse('Mock' in search.answers)
 
-        search = get_search_mock(query=b'user-agent', pageno=1)
+        search = get_search_mock(query='user-agent', pageno=1)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertTrue('Mock' in search.result_container.answers)
+        self.assertTrue('Mock' in search.answers)
 
-        search = get_search_mock(query=b'user-agent', pageno=2)
+        search = get_search_mock(query='user-agent', pageno=2)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertFalse('Mock' in search.result_container.answers)
+        self.assertFalse('Mock' in search.answers)
 
-        search = get_search_mock(query=b'What is my User-Agent?', pageno=1)
+        search = get_search_mock(query='What is my User-Agent?', pageno=1)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertTrue('Mock' in search.result_container.answers)
+        self.assertTrue('Mock' in search.answers)
 
-        search = get_search_mock(query=b'What is my User-Agent?', pageno=2)
+        search = get_search_mock(query='What is my User-Agent?', pageno=2)
         store.call(store.plugins, 'post_search', request, search)
-        self.assertFalse('Mock' in search.result_container.answers)
+        self.assertFalse('Mock' in search.answers)
diff --git a/tests/unit/test_preferences.py b/tests/unit/test_preferences.py
index 885c515e28fb4bca58e430be076973e6ea2f7737..787552a39a4e0d3758f6f4c4b2df3a28db6c8aef 100644
--- a/tests/unit/test_preferences.py
+++ b/tests/unit/test_preferences.py
@@ -1,6 +1,6 @@
 from searx.preferences import (EnumStringSetting, MapSetting, MissingArgumentException, SearchLanguageSetting,
                                MultipleChoiceSetting, PluginsSetting, ValidationException)
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
 class PluginStub(object):
@@ -10,7 +10,7 @@ class PluginStub(object):
         self.default_on = default_on
 
 
-class TestSettings(SearxTestCase):
+class TestSettings(TestCase):
     # map settings
 
     def test_map_setting_invalid_initialization(self):
@@ -28,13 +28,13 @@ class TestSettings(SearxTestCase):
 
     def test_map_setting_valid_default(self):
         setting = MapSetting(3, map={'dog': 1, 'bat': 2, 'cat': 3})
-        self.assertEquals(setting.get_value(), 3)
+        self.assertEqual(setting.get_value(), 3)
 
     def test_map_setting_valid_choice(self):
         setting = MapSetting(3, map={'dog': 1, 'bat': 2, 'cat': 3})
-        self.assertEquals(setting.get_value(), 3)
+        self.assertEqual(setting.get_value(), 3)
         setting.parse('bat')
-        self.assertEquals(setting.get_value(), 2)
+        self.assertEqual(setting.get_value(), 2)
 
     def test_enum_setting_invalid_initialization(self):
         with self.assertRaises(MissingArgumentException):
@@ -56,13 +56,13 @@ class TestSettings(SearxTestCase):
 
     def test_enum_setting_valid_default(self):
         setting = EnumStringSetting(3, choices=[1, 2, 3])
-        self.assertEquals(setting.get_value(), 3)
+        self.assertEqual(setting.get_value(), 3)
 
     def test_enum_setting_valid_choice(self):
         setting = EnumStringSetting(3, choices=[1, 2, 3])
-        self.assertEquals(setting.get_value(), 3)
+        self.assertEqual(setting.get_value(), 3)
         setting.parse(2)
-        self.assertEquals(setting.get_value(), 2)
+        self.assertEqual(setting.get_value(), 2)
 
     # multiple choice settings
     def test_multiple_setting_invalid_initialization(self):
@@ -80,45 +80,45 @@ class TestSettings(SearxTestCase):
 
     def test_multiple_setting_valid_default(self):
         setting = MultipleChoiceSetting(['3'], choices=['1', '2', '3'])
-        self.assertEquals(setting.get_value(), ['3'])
+        self.assertEqual(setting.get_value(), ['3'])
 
     def test_multiple_setting_valid_choice(self):
         setting = MultipleChoiceSetting(['3'], choices=['1', '2', '3'])
-        self.assertEquals(setting.get_value(), ['3'])
+        self.assertEqual(setting.get_value(), ['3'])
         setting.parse('2')
-        self.assertEquals(setting.get_value(), ['2'])
+        self.assertEqual(setting.get_value(), ['2'])
 
     # search language settings
     def test_lang_setting_valid_choice(self):
         setting = SearchLanguageSetting('all', choices=['all', 'de', 'en'])
         setting.parse('de')
-        self.assertEquals(setting.get_value(), 'de')
+        self.assertEqual(setting.get_value(), 'de')
 
     def test_lang_setting_invalid_choice(self):
         setting = SearchLanguageSetting('all', choices=['all', 'de', 'en'])
         setting.parse('xx')
-        self.assertEquals(setting.get_value(), 'all')
+        self.assertEqual(setting.get_value(), 'all')
 
     def test_lang_setting_old_cookie_choice(self):
         setting = SearchLanguageSetting('all', choices=['all', 'es', 'es-ES'])
         setting.parse('es_XA')
-        self.assertEquals(setting.get_value(), 'es')
+        self.assertEqual(setting.get_value(), 'es')
 
     def test_lang_setting_old_cookie_format(self):
         setting = SearchLanguageSetting('all', choices=['all', 'es', 'es-ES'])
         setting.parse('es_ES')
-        self.assertEquals(setting.get_value(), 'es-ES')
+        self.assertEqual(setting.get_value(), 'es-ES')
 
     # plugins settings
     def test_plugins_setting_all_default_enabled(self):
         plugin1 = PluginStub('plugin1', True)
         plugin2 = PluginStub('plugin2', True)
         setting = PluginsSetting(['3'], choices=[plugin1, plugin2])
-        self.assertEquals(setting.get_enabled(), set(['plugin1', 'plugin2']))
+        self.assertEqual(setting.get_enabled(), set(['plugin1', 'plugin2']))
 
     def test_plugins_setting_few_default_enabled(self):
         plugin1 = PluginStub('plugin1', True)
         plugin2 = PluginStub('plugin2', False)
         plugin3 = PluginStub('plugin3', True)
         setting = PluginsSetting('name', choices=[plugin1, plugin2, plugin3])
-        self.assertEquals(setting.get_enabled(), set(['plugin1', 'plugin3']))
+        self.assertEqual(setting.get_enabled(), set(['plugin1', 'plugin3']))
diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py
index 49ccb608fce27ff7c6b5a52150202a06918130f8..7c575572615804bb5f961e2869079ec462b4c0fc 100644
--- a/tests/unit/test_query.py
+++ b/tests/unit/test_query.py
@@ -1,17 +1,17 @@
 from searx.query import RawTextQuery
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
-class TestQuery(SearxTestCase):
+class TestQuery(TestCase):
 
     def test_simple_query(self):
         query_text = 'the query'
         query = RawTextQuery(query_text, [])
         query.parse_query()
 
-        self.assertEquals(query.getFullQuery(), query_text)
-        self.assertEquals(len(query.query_parts), 1)
-        self.assertEquals(len(query.languages), 0)
+        self.assertEqual(query.getFullQuery(), query_text)
+        self.assertEqual(len(query.query_parts), 1)
+        self.assertEqual(len(query.languages), 0)
         self.assertFalse(query.specific)
 
     def test_language_code(self):
@@ -21,9 +21,9 @@ class TestQuery(SearxTestCase):
         query = RawTextQuery(full_query, [])
         query.parse_query()
 
-        self.assertEquals(query.getFullQuery(), full_query)
-        self.assertEquals(len(query.query_parts), 3)
-        self.assertEquals(len(query.languages), 1)
+        self.assertEqual(query.getFullQuery(), full_query)
+        self.assertEqual(len(query.query_parts), 3)
+        self.assertEqual(len(query.languages), 1)
         self.assertIn(language, query.languages)
         self.assertFalse(query.specific)
 
@@ -34,8 +34,8 @@ class TestQuery(SearxTestCase):
         query = RawTextQuery(full_query, [])
         query.parse_query()
 
-        self.assertEquals(query.getFullQuery(), full_query)
-        self.assertEquals(len(query.query_parts), 3)
+        self.assertEqual(query.getFullQuery(), full_query)
+        self.assertEqual(len(query.query_parts), 3)
         self.assertIn('en', query.languages)
         self.assertFalse(query.specific)
 
@@ -46,8 +46,8 @@ class TestQuery(SearxTestCase):
         query = RawTextQuery(full_query, [])
         query.parse_query()
 
-        self.assertEquals(query.getFullQuery(), full_query)
-        self.assertEquals(len(query.query_parts), 3)
+        self.assertEqual(query.getFullQuery(), full_query)
+        self.assertEqual(len(query.query_parts), 3)
         self.assertIn('all', query.languages)
         self.assertFalse(query.specific)
 
@@ -58,7 +58,7 @@ class TestQuery(SearxTestCase):
         query = RawTextQuery(full_query, [])
         query.parse_query()
 
-        self.assertEquals(query.getFullQuery(), full_query)
-        self.assertEquals(len(query.query_parts), 1)
-        self.assertEquals(len(query.languages), 0)
+        self.assertEqual(query.getFullQuery(), full_query)
+        self.assertEqual(len(query.query_parts), 1)
+        self.assertEqual(len(query.languages), 0)
         self.assertFalse(query.specific)
diff --git a/tests/unit/test_results.py b/tests/unit/test_results.py
index 274b5b37af81a208bd39f769d4912b5913f18761..b659daafac213fe0f8075794c104263e93e2c18f 100644
--- a/tests/unit/test_results.py
+++ b/tests/unit/test_results.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from searx.results import ResultContainer
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
 def fake_result(url='https://aa.bb/cc?dd=ee#ff',
@@ -17,7 +17,7 @@ def fake_result(url='https://aa.bb/cc?dd=ee#ff',
 
 
 #  TODO
-class ResultContainerTestCase(SearxTestCase):
+class ResultContainerTestCase(TestCase):
 
     def test_empty(self):
         c = ResultContainer()
diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py
index af5fffd8b3a501a90842c8caa67d27a204c5fcd4..62c46f8ad8530ca24872911cc9dbd59eff3e4a55 100644
--- a/tests/unit/test_search.py
+++ b/tests/unit/test_search.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from searx.testing import SearxTestCase
+from unittest import TestCase
 
 
 #  TODO
-class SearchTestCase(SearxTestCase):
+class SearchTestCase(TestCase):
 
     def test_(self):
         pass
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 4854636c721cd954465501202bcdec8fa6d0dd55..211cd0bc298b3dde05fbf2f510b4ed9297c2066c 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -1,14 +1,10 @@
 # -*- coding: utf-8 -*-
 import mock
-import sys
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from searx import utils
 
-if sys.version_info[0] == 3:
-    unicode = str
 
-
-class TestUtils(SearxTestCase):
+class TestUtils(TestCase):
 
     def test_gen_useragent(self):
         self.assertIsInstance(utils.gen_useragent(), str)
@@ -34,9 +30,9 @@ class TestUtils(SearxTestCase):
             self.assertEqual(utils.highlight_content(content, None), content)
 
         content = 'a'
-        query = b'test'
+        query = 'test'
         self.assertEqual(utils.highlight_content(content, query), content)
-        query = b'a test'
+        query = 'a test'
         self.assertEqual(utils.highlight_content(content, query), content)
 
     def test_html_to_text(self):
@@ -52,15 +48,15 @@ class TestUtils(SearxTestCase):
             </span>
         </a>
         """
-        self.assertIsInstance(utils.html_to_text(html), unicode)
+        self.assertIsInstance(utils.html_to_text(html), str)
         self.assertIsNotNone(utils.html_to_text(html))
         self.assertEqual(utils.html_to_text(html), "Test text")
 
     def test_prettify_url(self):
         data = (('https://searx.me/', 'https://searx.me/'),
-                (u'https://searx.me/ű', u'https://searx.me/ű'),
+                ('https://searx.me/ű', 'https://searx.me/ű'),
                 ('https://searx.me/' + (100 * 'a'), 'https://searx.me/[...]aaaaaaaaaaaaaaaaa'),
-                (u'https://searx.me/' + (100 * u'ű'), u'https://searx.me/[...]űűűűűűűűűűűűűűűűű'))
+                ('https://searx.me/' + (100 * 'ű'), 'https://searx.me/[...]űűűűűűűűűűűűűűűűű'))
 
         for test_url, expected in data:
             self.assertEqual(utils.prettify_url(test_url, max_length=32), expected)
@@ -91,7 +87,7 @@ class TestUtils(SearxTestCase):
         self.assertEqual(utils.match_language('he-IL', ['iw-IL'], aliases), 'iw-IL')
 
 
-class TestHTMLTextExtractor(SearxTestCase):
+class TestHTMLTextExtractor(TestCase):
 
     def setUp(self):
         self.html_text_extractor = utils.HTMLTextExtractor()
@@ -101,12 +97,12 @@ class TestHTMLTextExtractor(SearxTestCase):
 
     def test_handle_charref(self):
         self.html_text_extractor.handle_charref('xF')
-        self.assertIn(u'\x0f', self.html_text_extractor.result)
+        self.assertIn('\x0f', self.html_text_extractor.result)
         self.html_text_extractor.handle_charref('XF')
-        self.assertIn(u'\x0f', self.html_text_extractor.result)
+        self.assertIn('\x0f', self.html_text_extractor.result)
 
         self.html_text_extractor.handle_charref('97')
-        self.assertIn(u'a', self.html_text_extractor.result)
+        self.assertIn('a', self.html_text_extractor.result)
 
     def test_handle_entityref(self):
         entity = 'test'
@@ -114,7 +110,7 @@ class TestHTMLTextExtractor(SearxTestCase):
         self.assertIn(entity, self.html_text_extractor.result)
 
 
-class TestUnicodeWriter(SearxTestCase):
+class TestUnicodeWriter(TestCase):
 
     def setUp(self):
         self.unicode_writer = utils.UnicodeWriter(mock.MagicMock())
diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py
index e6739bfe5961caa8e7974d997a4046ff994ced16..8198b59809e84c14a5d88f3572f35216a8f85e5c 100644
--- a/tests/unit/test_webapp.py
+++ b/tests/unit/test_webapp.py
@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
 import json
-from mock import Mock
+from mock import Mock, patch
+from mockredis import mock_strict_redis_client
 from searx import webapp
-from searx.testing import SearxTestCase
+from unittest import TestCase
 from searx.search import Search
 from searx.url_utils import ParseResult
 
 
-class ViewsTestCase(SearxTestCase):
+class ViewsTestCase(TestCase):
 
     def setUp(self):
         webapp.app.config['TESTING'] = True  # to get better error messages
@@ -19,12 +20,14 @@ class ViewsTestCase(SearxTestCase):
             {
                 'content': 'first test content',
                 'title': 'First Test',
+                'category': 'general',
                 'url': 'http://first.test.xyz',
                 'engines': ['youtube', 'startpage'],
                 'engine': 'startpage',
                 'parsed_url': ParseResult(scheme='http', netloc='first.test.xyz', path='/', params='', query='', fragment=''),  # noqa
             }, {
                 'content': 'second test content',
+                'category': 'general',
                 'title': 'Second Test',
                 'url': 'http://second.test.xyz',
                 'engines': ['youtube', 'startpage'],
@@ -33,16 +36,16 @@ class ViewsTestCase(SearxTestCase):
             },
         ]
 
-        def search_mock(search_self, *args):
-            search_self.result_container = Mock(get_ordered_results=lambda: self.test_results,
-                                                answers=set(),
-                                                corrections=set(),
-                                                suggestions=set(),
-                                                infoboxes=[],
-                                                unresponsive_engines=set(),
-                                                results=self.test_results,
-                                                results_number=lambda: 3,
-                                                results_length=lambda: len(self.test_results))
+        def search_mock(*args):
+            return Mock(get_ordered_results=lambda: self.test_results,
+                        answers=set(),
+                        corrections=set(),
+                        suggestions=set(),
+                        infoboxes=[],
+                        unresponsive_engines=set(),
+                        results=self.test_results,
+                        results_number=lambda: 3,
+                        results_length=lambda: len(self.test_results))
 
         Search.search = search_mock
 
@@ -60,6 +63,7 @@ class ViewsTestCase(SearxTestCase):
         self.assertEqual(result.status_code, 200)
         self.assertIn(b'<div class="title"><h1>searx</h1></div>', result.data)
 
+    @patch('redis.Redis', mock_strict_redis_client)
     def test_index_html(self):
         result = self.app.post('/', data={'q': 'test'})
         self.assertIn(
@@ -71,53 +75,6 @@ class ViewsTestCase(SearxTestCase):
             result.data
         )
 
-    def test_index_json(self):
-        result = self.app.post('/', data={'q': 'test', 'format': 'json'})
-
-        result_dict = json.loads(result.data.decode('utf-8'))
-
-        self.assertEqual('test', result_dict['query'])
-        self.assertEqual(result_dict['results'][0]['content'], 'first test content')
-        self.assertEqual(result_dict['results'][0]['url'], 'http://first.test.xyz')
-
-    def test_index_csv(self):
-        result = self.app.post('/', data={'q': 'test', 'format': 'csv'})
-
-        self.assertEqual(
-            b'title,url,content,host,engine,score\r\n'
-            b'First Test,http://first.test.xyz,first test content,first.test.xyz,startpage,\r\n'  # noqa
-            b'Second Test,http://second.test.xyz,second test content,second.test.xyz,youtube,\r\n',  # noqa
-            result.data
-        )
-
-    def test_index_rss(self):
-        result = self.app.post('/', data={'q': 'test', 'format': 'rss'})
-
-        self.assertIn(
-            b'<description>Search results for "test" - searx</description>',
-            result.data
-        )
-
-        self.assertIn(
-            b'<opensearch:totalResults>3</opensearch:totalResults>',
-            result.data
-        )
-
-        self.assertIn(
-            b'<title>First Test</title>',
-            result.data
-        )
-
-        self.assertIn(
-            b'<link>http://first.test.xyz</link>',
-            result.data
-        )
-
-        self.assertIn(
-            b'<description>first test content</description>',
-            result.data
-        )
-
     def test_about(self):
         result = self.app.get('/about')
         self.assertEqual(result.status_code, 200)
@@ -139,11 +96,6 @@ class ViewsTestCase(SearxTestCase):
             result.data
         )
 
-    def test_stats(self):
-        result = self.app.get('/stats')
-        self.assertEqual(result.status_code, 200)
-        self.assertIn(b'<h2>Engine stats</h2>', result.data)
-
     def test_robots_txt(self):
         result = self.app.get('/robots.txt')
         self.assertEqual(result.status_code, 200)
diff --git a/utils/standalone_searx.py b/utils/standalone_searx.py
index 2231636396ccee1d2d832d76f6b548c8f1ea741e..9efdc556dea67cda112bad06f86689cb8b7fd353 100755
--- a/utils/standalone_searx.py
+++ b/utils/standalone_searx.py
@@ -56,7 +56,7 @@ args = parser.parse_args()
 # search results for the query
 form = {
     "q":args.query,
-    "categories":args.category.decode('utf-8'),
+    "categories":args.category,
     "pageno":str(args.pageno),
     "language":args.lang,
     "time_range":args.timerange
@@ -64,9 +64,9 @@ form = {
 preferences = searx.preferences.Preferences(['oscar'], searx.engines.categories.keys(), searx.engines.engines, [])
 preferences.key_value_settings['safesearch'].parse(args.safesearch)
 
-search_query = searx.search.get_search_query_from_webapp(preferences, form)
-search = searx.search.Search(search_query)
-result_container = search.search()
+search = searx.Search()
+search_query = search.get_search_query_from_webapp(preferences, form)
+result_container = search.search(search_query)
 
 # output
 from datetime import datetime