diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map
index 5d2936fa3..348dd7dfa 100644
Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ
diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map
index 4dc0acb52..97323d9a9 100644
Binary files a/searx/static/themes/oscar/css/logicodev.min.css.map and b/searx/static/themes/oscar/css/logicodev.min.css.map differ
diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js
index 8e9528e5b..9a0718a11 100644
--- a/searx/static/themes/oscar/gruntfile.js
+++ b/searx/static/themes/oscar/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
         separator: ';'
       },
       dist: {
-        src: ['js/searx_src/*.js'],
+        src: ['src/js/*.js'],
         dest: 'js/searx.js'
       }
     },
@@ -38,26 +38,26 @@ module.exports = function(grunt) {
     less: {
       development: {
         options: {
-          paths: ["less/pointhi", "less/logicodev", "less/logicodev-dark", "less/bootstrap"]
+          paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark"]
         },
         files: {
-          "css/pointhi.css": "less/pointhi/oscar.less",
-          "css/logicodev.css": "less/logicodev-dark/oscar.less",
-          "css/logicodev-dark.css": "less/logicodev/oscar.less"
+          "css/pointhi.css": "src/less/pointhi/oscar.less",
+          "css/logicodev.css": "src/less/logicodev-dark/oscar.less",
+          "css/logicodev-dark.css": "src/less/logicodev/oscar.less"
         }
       },
       production: {
         options: {
-          paths: ["less/pointhi", "less/logicodev", "less/logicodev-dark", "less/bootstrap"],
+          paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark"],
           plugins: [
             new (require('less-plugin-clean-css'))()
           ],
           sourceMap: true,
         },
         files: {
-          "css/pointhi.min.css": "less/pointhi/oscar.less",
-          "css/logicodev.min.css": "less/logicodev/oscar.less",
-          "css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"
+          "css/pointhi.min.css": "src/less/pointhi/oscar.less",
+          "css/logicodev.min.css": "src/less/logicodev/oscar.less",
+          "css/logicodev-dark.min.css": "src/less/logicodev-dark/oscar.less"
         }
       },
     },
@@ -67,7 +67,7 @@ module.exports = function(grunt) {
             tasks: ['jshint', 'concat', 'uglify']
         },
         oscar_styles: {
-            files: ['less/pointhi/**/*.less'],
+            files: ['src/less/pointhi/**/*.less'],
             tasks: ['less:development', 'less:production']
         },
         bootstrap_styles: {
diff --git a/searx/static/themes/oscar/js/searx_src/01_init.js b/searx/static/themes/oscar/src/js/01_init.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/01_init.js
rename to searx/static/themes/oscar/src/js/01_init.js
diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/src/js/autocompleter.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/autocompleter.js
rename to searx/static/themes/oscar/src/js/autocompleter.js
diff --git a/searx/static/themes/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/src/js/element_modifiers.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/element_modifiers.js
rename to searx/static/themes/oscar/src/js/element_modifiers.js
diff --git a/searx/static/themes/oscar/js/searx_src/infobox.js b/searx/static/themes/oscar/src/js/infobox.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/infobox.js
rename to searx/static/themes/oscar/src/js/infobox.js
diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/src/js/leaflet_map.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/leaflet_map.js
rename to searx/static/themes/oscar/src/js/leaflet_map.js
diff --git a/searx/static/themes/oscar/js/searx_src/toggleall.js b/searx/static/themes/oscar/src/js/toggleall.js
similarity index 100%
rename from searx/static/themes/oscar/js/searx_src/toggleall.js
rename to searx/static/themes/oscar/src/js/toggleall.js
diff --git a/searx/static/themes/oscar/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev-dark/oscar.less
rename to searx/static/themes/oscar/src/less/logicodev-dark/oscar.less
diff --git a/searx/static/themes/oscar/less/logicodev/advanced.less b/searx/static/themes/oscar/src/less/logicodev/advanced.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/advanced.less
rename to searx/static/themes/oscar/src/less/logicodev/advanced.less
diff --git a/searx/static/themes/oscar/less/logicodev/checkbox.less b/searx/static/themes/oscar/src/less/logicodev/checkbox.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/checkbox.less
rename to searx/static/themes/oscar/src/less/logicodev/checkbox.less
diff --git a/searx/static/themes/oscar/less/logicodev/code.less b/searx/static/themes/oscar/src/less/logicodev/code.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/code.less
rename to searx/static/themes/oscar/src/less/logicodev/code.less
diff --git a/searx/static/themes/oscar/less/logicodev/cursor.less b/searx/static/themes/oscar/src/less/logicodev/cursor.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/cursor.less
rename to searx/static/themes/oscar/src/less/logicodev/cursor.less
diff --git a/searx/static/themes/oscar/less/logicodev/footer.less b/searx/static/themes/oscar/src/less/logicodev/footer.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/footer.less
rename to searx/static/themes/oscar/src/less/logicodev/footer.less
diff --git a/searx/static/themes/oscar/less/logicodev/infobox.less b/searx/static/themes/oscar/src/less/logicodev/infobox.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/infobox.less
rename to searx/static/themes/oscar/src/less/logicodev/infobox.less
diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/src/less/logicodev/navbar.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/navbar.less
rename to searx/static/themes/oscar/src/less/logicodev/navbar.less
diff --git a/searx/static/themes/oscar/less/logicodev/onoff.less b/searx/static/themes/oscar/src/less/logicodev/onoff.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/onoff.less
rename to searx/static/themes/oscar/src/less/logicodev/onoff.less
diff --git a/searx/static/themes/oscar/less/logicodev/oscar.less b/searx/static/themes/oscar/src/less/logicodev/oscar.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/oscar.less
rename to searx/static/themes/oscar/src/less/logicodev/oscar.less
diff --git a/searx/static/themes/oscar/less/logicodev/preferences.less b/searx/static/themes/oscar/src/less/logicodev/preferences.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/preferences.less
rename to searx/static/themes/oscar/src/less/logicodev/preferences.less
diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/src/less/logicodev/results.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/results.less
rename to searx/static/themes/oscar/src/less/logicodev/results.less
diff --git a/searx/static/themes/oscar/less/logicodev/search.less b/searx/static/themes/oscar/src/less/logicodev/search.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/search.less
rename to searx/static/themes/oscar/src/less/logicodev/search.less
diff --git a/searx/static/themes/oscar/less/logicodev/variables.less b/searx/static/themes/oscar/src/less/logicodev/variables.less
similarity index 100%
rename from searx/static/themes/oscar/less/logicodev/variables.less
rename to searx/static/themes/oscar/src/less/logicodev/variables.less
diff --git a/searx/static/themes/oscar/less/pointhi/advanced.less b/searx/static/themes/oscar/src/less/pointhi/advanced.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/advanced.less
rename to searx/static/themes/oscar/src/less/pointhi/advanced.less
diff --git a/searx/static/themes/oscar/less/pointhi/checkbox.less b/searx/static/themes/oscar/src/less/pointhi/checkbox.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/checkbox.less
rename to searx/static/themes/oscar/src/less/pointhi/checkbox.less
diff --git a/searx/static/themes/oscar/less/pointhi/code.less b/searx/static/themes/oscar/src/less/pointhi/code.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/code.less
rename to searx/static/themes/oscar/src/less/pointhi/code.less
diff --git a/searx/static/themes/oscar/less/pointhi/cursor.less b/searx/static/themes/oscar/src/less/pointhi/cursor.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/cursor.less
rename to searx/static/themes/oscar/src/less/pointhi/cursor.less
diff --git a/searx/static/themes/oscar/less/pointhi/footer.less b/searx/static/themes/oscar/src/less/pointhi/footer.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/footer.less
rename to searx/static/themes/oscar/src/less/pointhi/footer.less
diff --git a/searx/static/themes/oscar/less/pointhi/infobox.less b/searx/static/themes/oscar/src/less/pointhi/infobox.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/infobox.less
rename to searx/static/themes/oscar/src/less/pointhi/infobox.less
diff --git a/searx/static/themes/oscar/less/pointhi/navbar.less b/searx/static/themes/oscar/src/less/pointhi/navbar.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/navbar.less
rename to searx/static/themes/oscar/src/less/pointhi/navbar.less
diff --git a/searx/static/themes/oscar/less/pointhi/onoff.less b/searx/static/themes/oscar/src/less/pointhi/onoff.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/onoff.less
rename to searx/static/themes/oscar/src/less/pointhi/onoff.less
diff --git a/searx/static/themes/oscar/less/pointhi/oscar.less b/searx/static/themes/oscar/src/less/pointhi/oscar.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/oscar.less
rename to searx/static/themes/oscar/src/less/pointhi/oscar.less
diff --git a/searx/static/themes/oscar/less/pointhi/preferences.less b/searx/static/themes/oscar/src/less/pointhi/preferences.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/preferences.less
rename to searx/static/themes/oscar/src/less/pointhi/preferences.less
diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/src/less/pointhi/results.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/results.less
rename to searx/static/themes/oscar/src/less/pointhi/results.less
diff --git a/searx/static/themes/oscar/less/pointhi/search.less b/searx/static/themes/oscar/src/less/pointhi/search.less
similarity index 100%
rename from searx/static/themes/oscar/less/pointhi/search.less
rename to searx/static/themes/oscar/src/less/pointhi/search.less