Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

185 files changed, 18 insertions, 6 deletions

diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js
deleted file mode 100644
index 0b3aa73f9..000000000
--- a/searx/static/oscar/js/searx.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! oscar/searx.min.js | 22-12-2014 | https://github.com/asciimoo/searx */
-requirejs.config({baseUrl:"./static/oscar/js",paths:{app:"../app"}}),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(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(a,b):$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(b,c):$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||-1==i.indexOf(d)){switch(c+="<tr><td>"+d+"</td><td>",d){case"phone":case"fax":c+='<a href="tel:'+b.tags[d].replace(/ /g,"")+'">'+b.tags[d]+"</a>";break;case"email":c+='<a href="mailto:'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"website":case"url":c+='<a href="'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikidata":c+='<a href="https://www.wikidata.org/wiki/'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+='<a href="https://'+b.tags[d].substring(0,b.tags[d].indexOf(":"))+".wikipedia.org/wiki/"+b.tags[d].substring(b.tags[d].indexOf(":")+1)+'">'+b.tags[d]+"</a>";break}default:c+=b.tags[d]}c+="</td></tr>"}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'<p class="text-muted">could not load data!</p>')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',j=new L.TileLayer(h,{minZoom:1,maxZoom:19,attribution:i}),k="http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg",l='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',m=new L.TileLayer(k,{minZoom:1,maxZoom:18,subdomains:"1234",attribution:l}),n="http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg",o='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';new L.TileLayer(n,{minZoom:1,maxZoom:11,subdomains:"1234",attribution:o})}map_bounds?setTimeout(function(){a.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?a.setView(new L.LatLng(d,c),e):a.setView(new L.LatLng(d,c),8)),a.addLayer(m);var p={"OSM Mapnik":j,MapQuest:m};L.control.layers(p).addTo(a),g&&L.geoJson(g).addTo(a)}),$(this).off(a)})});
\ No newline at end of file
diff --git a/searx/static/courgette/css/style.css b/searx/static/themes/courgette/css/style.css
index 866686c9c..866686c9c 100644
--- a/searx/static/courgette/css/style.css
+++ b/searx/static/themes/courgette/css/style.css
diff --git a/searx/static/courgette/img/bg-body-index.jpg b/searx/static/themes/courgette/img/bg-body-index.jpg
index ff28f5fc1..ff28f5fc1 100644
--- a/searx/static/courgette/img/bg-body-index.jpg
+++ b/searx/static/themes/courgette/img/bg-body-index.jpg
diff --git a/searx/static/courgette/img/favicon.png b/searx/static/themes/courgette/img/favicon.png
index cefbac496..cefbac496 100644
--- a/searx/static/courgette/img/favicon.png
+++ b/searx/static/themes/courgette/img/favicon.png
diff --git a/searx/static/courgette/img/github_ribbon.png b/searx/static/themes/courgette/img/github_ribbon.png
index 146ef8a80..146ef8a80 100644
--- a/searx/static/courgette/img/github_ribbon.png
+++ b/searx/static/themes/courgette/img/github_ribbon.png
diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/themes/courgette/img/icons/icon_dailymotion.ico
index b161a57fb..b161a57fb 100644
--- a/searx/static/courgette/img/icon_dailymotion.ico
+++ b/searx/static/themes/courgette/img/icons/icon_dailymotion.ico
diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/themes/courgette/img/icons/icon_deviantart.ico
index 26c353325..26c353325 100644
--- a/searx/static/courgette/img/icon_deviantart.ico
+++ b/searx/static/themes/courgette/img/icons/icon_deviantart.ico
diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/themes/courgette/img/icons/icon_github.ico
index 133f0ca35..133f0ca35 100644
--- a/searx/static/courgette/img/icon_github.ico
+++ b/searx/static/themes/courgette/img/icons/icon_github.ico
diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/themes/courgette/img/icons/icon_kickass.ico
index 4aa2c77a5..4aa2c77a5 100644
--- a/searx/static/courgette/img/icon_kickass.ico
+++ b/searx/static/themes/courgette/img/icons/icon_kickass.ico
diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/themes/courgette/img/icons/icon_soundcloud.ico
index 4130bea1b..4130bea1b 100644
--- a/searx/static/courgette/img/icon_soundcloud.ico
+++ b/searx/static/themes/courgette/img/icons/icon_soundcloud.ico
diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/themes/courgette/img/icons/icon_stackoverflow.ico
index b2242bc6c..b2242bc6c 100644
--- a/searx/static/courgette/img/icon_stackoverflow.ico
+++ b/searx/static/themes/courgette/img/icons/icon_stackoverflow.ico
diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/themes/courgette/img/icons/icon_twitter.ico
index b4a71699a..b4a71699a 100644
--- a/searx/static/courgette/img/icon_twitter.ico
+++ b/searx/static/themes/courgette/img/icons/icon_twitter.ico
diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/themes/courgette/img/icons/icon_vimeo.ico
index 4fe4336da..4fe4336da 100644
--- a/searx/static/courgette/img/icon_vimeo.ico
+++ b/searx/static/themes/courgette/img/icons/icon_vimeo.ico
diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/themes/courgette/img/icons/icon_wikipedia.ico
index 911fa76f6..911fa76f6 100644
--- a/searx/static/courgette/img/icon_wikipedia.ico
+++ b/searx/static/themes/courgette/img/icons/icon_wikipedia.ico
diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/themes/courgette/img/icons/icon_youtube.ico
index 977887dbb..977887dbb 100644
--- a/searx/static/courgette/img/icon_youtube.ico
+++ b/searx/static/themes/courgette/img/icons/icon_youtube.ico
diff --git a/searx/static/courgette/img/preference-icon.png b/searx/static/themes/courgette/img/preference-icon.png
index 039db04a8..039db04a8 100644
--- a/searx/static/courgette/img/preference-icon.png
+++ b/searx/static/themes/courgette/img/preference-icon.png
diff --git a/searx/static/courgette/img/search-icon.png b/searx/static/themes/courgette/img/search-icon.png
index 52c267842..52c267842 100644
--- a/searx/static/courgette/img/search-icon.png
+++ b/searx/static/themes/courgette/img/search-icon.png
diff --git a/searx/static/courgette/img/searx-mobile.png b/searx/static/themes/courgette/img/searx-mobile.png
index 2b9383a5d..2b9383a5d 100644
--- a/searx/static/courgette/img/searx-mobile.png
+++ b/searx/static/themes/courgette/img/searx-mobile.png
diff --git a/searx/static/courgette/img/searx.png b/searx/static/themes/courgette/img/searx.png
index e162da502..e162da502 100644
--- a/searx/static/courgette/img/searx.png
+++ b/searx/static/themes/courgette/img/searx.png
diff --git a/searx/static/courgette/img/searx_logo.svg b/searx/static/themes/courgette/img/searx_logo.svg
index 67a2d4588..67a2d4588 100644
--- a/searx/static/courgette/img/searx_logo.svg
+++ b/searx/static/themes/courgette/img/searx_logo.svg
diff --git a/searx/static/courgette/js/mootools-autocompleter-1.1.2-min.js b/searx/static/themes/courgette/js/mootools-autocompleter-1.1.2-min.js
index 364e611cc..364e611cc 100644
--- a/searx/static/courgette/js/mootools-autocompleter-1.1.2-min.js
+++ b/searx/static/themes/courgette/js/mootools-autocompleter-1.1.2-min.js
diff --git a/searx/static/courgette/js/mootools-core-1.4.5-min.js b/searx/static/themes/courgette/js/mootools-core-1.4.5-min.js
index 569473d1c..569473d1c 100644
--- a/searx/static/courgette/js/mootools-core-1.4.5-min.js
+++ b/searx/static/themes/courgette/js/mootools-core-1.4.5-min.js
diff --git a/searx/static/courgette/js/searx.js b/searx/static/themes/courgette/js/searx.js
index 47dc722da..47dc722da 100644
--- a/searx/static/courgette/js/searx.js
+++ b/searx/static/themes/courgette/js/searx.js
diff --git a/searx/static/default/css/style.css b/searx/static/themes/default/css/style.css
index f0e498db7..f0e498db7 100644
--- a/searx/static/default/css/style.css
+++ b/searx/static/themes/default/css/style.css
diff --git a/searx/static/default/img/favicon.png b/searx/static/themes/default/img/favicon.png
index 28afb0111..28afb0111 100644
--- a/searx/static/default/img/favicon.png
+++ b/searx/static/themes/default/img/favicon.png
diff --git a/searx/static/default/img/github_ribbon.png b/searx/static/themes/default/img/github_ribbon.png
index 146ef8a80..146ef8a80 100644
--- a/searx/static/default/img/github_ribbon.png
+++ b/searx/static/themes/default/img/github_ribbon.png
diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/themes/default/img/icons/icon_dailymotion.ico
index b161a57fb..b161a57fb 100644
--- a/searx/static/default/img/icon_dailymotion.ico
+++ b/searx/static/themes/default/img/icons/icon_dailymotion.ico
diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/themes/default/img/icons/icon_deviantart.ico
index 26c353325..26c353325 100644
--- a/searx/static/default/img/icon_deviantart.ico
+++ b/searx/static/themes/default/img/icons/icon_deviantart.ico
diff --git a/searx/static/default/img/icon_github.ico b/searx/static/themes/default/img/icons/icon_github.ico
index 133f0ca35..133f0ca35 100644
--- a/searx/static/default/img/icon_github.ico
+++ b/searx/static/themes/default/img/icons/icon_github.ico
diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/themes/default/img/icons/icon_kickass.ico
index 4aa2c77a5..4aa2c77a5 100644
--- a/searx/static/default/img/icon_kickass.ico
+++ b/searx/static/themes/default/img/icons/icon_kickass.ico
diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/themes/default/img/icons/icon_soundcloud.ico
index 4130bea1b..4130bea1b 100644
--- a/searx/static/default/img/icon_soundcloud.ico
+++ b/searx/static/themes/default/img/icons/icon_soundcloud.ico
diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/themes/default/img/icons/icon_stackoverflow.ico
index b2242bc6c..b2242bc6c 100644
--- a/searx/static/default/img/icon_stackoverflow.ico
+++ b/searx/static/themes/default/img/icons/icon_stackoverflow.ico
diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/themes/default/img/icons/icon_twitter.ico
index b4a71699a..b4a71699a 100644
--- a/searx/static/default/img/icon_twitter.ico
+++ b/searx/static/themes/default/img/icons/icon_twitter.ico
diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/themes/default/img/icons/icon_vimeo.ico
index 4fe4336da..4fe4336da 100644
--- a/searx/static/default/img/icon_vimeo.ico
+++ b/searx/static/themes/default/img/icons/icon_vimeo.ico
diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/themes/default/img/icons/icon_wikipedia.ico
index 911fa76f6..911fa76f6 100644
--- a/searx/static/default/img/icon_wikipedia.ico
+++ b/searx/static/themes/default/img/icons/icon_wikipedia.ico
diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/themes/default/img/icons/icon_youtube.ico
index 977887dbb..977887dbb 100644
--- a/searx/static/default/img/icon_youtube.ico
+++ b/searx/static/themes/default/img/icons/icon_youtube.ico
diff --git a/searx/static/default/img/preference-icon.png b/searx/static/themes/default/img/preference-icon.png
index 300279d24..300279d24 100644
--- a/searx/static/default/img/preference-icon.png
+++ b/searx/static/themes/default/img/preference-icon.png
diff --git a/searx/static/default/img/search-icon.png b/searx/static/themes/default/img/search-icon.png
index d70310b5d..d70310b5d 100644
--- a/searx/static/default/img/search-icon.png
+++ b/searx/static/themes/default/img/search-icon.png
diff --git a/searx/static/default/img/searx.png b/searx/static/themes/default/img/searx.png
index e69e9eef9..e69e9eef9 100644
--- a/searx/static/default/img/searx.png
+++ b/searx/static/themes/default/img/searx.png
diff --git a/searx/static/default/img/searx_logo.svg b/searx/static/themes/default/img/searx_logo.svg
index 67a2d4588..67a2d4588 100644
--- a/searx/static/default/img/searx_logo.svg
+++ b/searx/static/themes/default/img/searx_logo.svg
diff --git a/searx/static/default/js/mootools-autocompleter-1.1.2-min.js b/searx/static/themes/default/js/mootools-autocompleter-1.1.2-min.js
index 364e611cc..364e611cc 100644
--- a/searx/static/default/js/mootools-autocompleter-1.1.2-min.js
+++ b/searx/static/themes/default/js/mootools-autocompleter-1.1.2-min.js
diff --git a/searx/static/default/js/mootools-core-1.4.5-min.js b/searx/static/themes/default/js/mootools-core-1.4.5-min.js
index 569473d1c..569473d1c 100644
--- a/searx/static/default/js/mootools-core-1.4.5-min.js
+++ b/searx/static/themes/default/js/mootools-core-1.4.5-min.js
diff --git a/searx/static/default/js/searx.js b/searx/static/themes/default/js/searx.js
index 9be969bb3..9be969bb3 100644
--- a/searx/static/default/js/searx.js
+++ b/searx/static/themes/default/js/searx.js
diff --git a/searx/static/default/less/autocompleter.less b/searx/static/themes/default/less/autocompleter.less
index db9601aeb..db9601aeb 100644
--- a/searx/static/default/less/autocompleter.less
+++ b/searx/static/themes/default/less/autocompleter.less
diff --git a/searx/static/default/less/code.less b/searx/static/themes/default/less/code.less
index a688dd98d..a688dd98d 100644
--- a/searx/static/default/less/code.less
+++ b/searx/static/themes/default/less/code.less
diff --git a/searx/static/default/less/definitions.less b/searx/static/themes/default/less/definitions.less
index 3e0b6579d..3e0b6579d 100644
--- a/searx/static/default/less/definitions.less
+++ b/searx/static/themes/default/less/definitions.less
diff --git a/searx/static/default/less/mixins.less b/searx/static/themes/default/less/mixins.less
index dbccce6e3..dbccce6e3 100644
--- a/searx/static/default/less/mixins.less
+++ b/searx/static/themes/default/less/mixins.less
diff --git a/searx/static/default/less/search.less b/searx/static/themes/default/less/search.less
index d285ca734..d285ca734 100644
--- a/searx/static/default/less/search.less
+++ b/searx/static/themes/default/less/search.less
diff --git a/searx/static/default/less/style.less b/searx/static/themes/default/less/style.less
index bae4f2749..bae4f2749 100644
--- a/searx/static/default/less/style.less
+++ b/searx/static/themes/default/less/style.less
diff --git a/searx/static/oscar/.gitignore b/searx/static/themes/oscar/.gitignore
index c2658d7d1..c2658d7d1 100644
--- a/searx/static/oscar/.gitignore
+++ b/searx/static/themes/oscar/.gitignore
diff --git a/searx/static/oscar/README.rst  b/searx/static/themes/oscar/README.rst
index 7a1800add..e7daa8719 100644
--- a/searx/static/oscar/README.rst 
+++ b/searx/static/themes/oscar/README.rst
@@ -1,14 +1,14 @@
 install dependencies
 ~~~~~~~~~~~~~~~~~~~~
 
-run this command in the directory ``searx/static/oscar``
+run this command in the directory ``searx/static/themes/oscar``
 
 ``npm install``
 
 compile sources
 ~~~~~~~~~~~~~~~
 
-run this command in the directory ``searx/static/oscar``
+run this command in the directory ``searx/static/themes/oscar``
 
 ``grunt``
 
diff --git a/searx/static/oscar/css/bootstrap.min.css b/searx/static/themes/oscar/css/bootstrap.min.css
index fb0e84ae4..fb0e84ae4 100644
--- a/searx/static/oscar/css/bootstrap.min.css
+++ b/searx/static/themes/oscar/css/bootstrap.min.css
diff --git a/searx/static/oscar/css/leaflet.min.css b/searx/static/themes/oscar/css/leaflet.min.css
index bca0c58b9..bca0c58b9 100644
--- a/searx/static/oscar/css/leaflet.min.css
+++ b/searx/static/themes/oscar/css/leaflet.min.css
diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/themes/oscar/css/oscar.min.css
index 970850a4a..970850a4a 100644
--- a/searx/static/oscar/css/oscar.min.css
+++ b/searx/static/themes/oscar/css/oscar.min.css
diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.eot b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.eot
index 4a4ca865d..4a4ca865d 100644
--- a/searx/static/oscar/fonts/glyphicons-halflings-regular.eot
+++ b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.eot
diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.svg b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.svg
index e3e2dc739..e3e2dc739 100644
--- a/searx/static/oscar/fonts/glyphicons-halflings-regular.svg
+++ b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.svg
diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.ttf b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.ttf
index 67fa00bf8..67fa00bf8 100644
--- a/searx/static/oscar/fonts/glyphicons-halflings-regular.ttf
+++ b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.ttf
diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.woff b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.woff
index 8c54182aa..8c54182aa 100644
--- a/searx/static/oscar/fonts/glyphicons-halflings-regular.woff
+++ b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.woff
diff --git a/searx/static/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js
index c591e8505..c591e8505 100644
--- a/searx/static/oscar/gruntfile.js
+++ b/searx/static/themes/oscar/gruntfile.js
diff --git a/searx/static/oscar/img/favicon.png b/searx/static/themes/oscar/img/favicon.png
index cefbac496..cefbac496 100644
--- a/searx/static/oscar/img/favicon.png
+++ b/searx/static/themes/oscar/img/favicon.png
diff --git a/searx/static/oscar/img/icons/README.md b/searx/static/themes/oscar/img/icons/README.md
index 0e3ad1c03..0e3ad1c03 100644
--- a/searx/static/oscar/img/icons/README.md
+++ b/searx/static/themes/oscar/img/icons/README.md
diff --git a/searx/static/oscar/img/icons/amazon.png b/searx/static/themes/oscar/img/icons/amazon.png
index 4f330f38e..4f330f38e 100644
--- a/searx/static/oscar/img/icons/amazon.png
+++ b/searx/static/themes/oscar/img/icons/amazon.png
diff --git a/searx/static/oscar/img/icons/dailymotion.png b/searx/static/themes/oscar/img/icons/dailymotion.png
index a15da99fa..a15da99fa 100644
--- a/searx/static/oscar/img/icons/dailymotion.png
+++ b/searx/static/themes/oscar/img/icons/dailymotion.png
diff --git a/searx/static/oscar/img/icons/deviantart.png b/searx/static/themes/oscar/img/icons/deviantart.png
index cec53bcea..cec53bcea 100644
--- a/searx/static/oscar/img/icons/deviantart.png
+++ b/searx/static/themes/oscar/img/icons/deviantart.png
diff --git a/searx/static/oscar/img/icons/facebook.png b/searx/static/themes/oscar/img/icons/facebook.png
index ac5a59493..ac5a59493 100644
--- a/searx/static/oscar/img/icons/facebook.png
+++ b/searx/static/themes/oscar/img/icons/facebook.png
diff --git a/searx/static/oscar/img/icons/flickr.png b/searx/static/themes/oscar/img/icons/flickr.png
index be238bb1a..be238bb1a 100644
--- a/searx/static/oscar/img/icons/flickr.png
+++ b/searx/static/themes/oscar/img/icons/flickr.png
diff --git a/searx/static/oscar/img/icons/github.png b/searx/static/themes/oscar/img/icons/github.png
index bf09bae55..bf09bae55 100644
--- a/searx/static/oscar/img/icons/github.png
+++ b/searx/static/themes/oscar/img/icons/github.png
diff --git a/searx/static/oscar/img/icons/kickass.png b/searx/static/themes/oscar/img/icons/kickass.png
index 567d1039f..567d1039f 100644
--- a/searx/static/oscar/img/icons/kickass.png
+++ b/searx/static/themes/oscar/img/icons/kickass.png
diff --git a/searx/static/themes/oscar/img/icons/openstreetmap.png b/searx/static/themes/oscar/img/icons/openstreetmap.png
new file mode 100644
index 000000000..4f88c9643
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/openstreetmap.png
diff --git a/searx/static/themes/oscar/img/icons/photon.png b/searx/static/themes/oscar/img/icons/photon.png
new file mode 100644
index 000000000..0d0732027
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/photon.png
diff --git a/searx/static/themes/oscar/img/icons/searchcode code.png b/searx/static/themes/oscar/img/icons/searchcode code.png
new file mode 100644
index 000000000..884c2660d
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/searchcode code.png
diff --git a/searx/static/themes/oscar/img/icons/searchcode doc.png b/searx/static/themes/oscar/img/icons/searchcode doc.png
new file mode 100644
index 000000000..884c2660d
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/searchcode doc.png
diff --git a/searx/static/oscar/img/icons/soundcloud.png b/searx/static/themes/oscar/img/icons/soundcloud.png
index 351c8030d..351c8030d 100644
--- a/searx/static/oscar/img/icons/soundcloud.png
+++ b/searx/static/themes/oscar/img/icons/soundcloud.png
diff --git a/searx/static/oscar/img/icons/stackoverflow.png b/searx/static/themes/oscar/img/icons/stackoverflow.png
index 812176ad2..812176ad2 100644
--- a/searx/static/oscar/img/icons/stackoverflow.png
+++ b/searx/static/themes/oscar/img/icons/stackoverflow.png
diff --git a/searx/static/oscar/img/icons/twitter.png b/searx/static/themes/oscar/img/icons/twitter.png
index f71c1973a..f71c1973a 100644
--- a/searx/static/oscar/img/icons/twitter.png
+++ b/searx/static/themes/oscar/img/icons/twitter.png
diff --git a/searx/static/oscar/img/icons/vimeo.png b/searx/static/themes/oscar/img/icons/vimeo.png
index 0238d24d2..0238d24d2 100644
--- a/searx/static/oscar/img/icons/vimeo.png
+++ b/searx/static/themes/oscar/img/icons/vimeo.png
diff --git a/searx/static/oscar/img/icons/wikipedia.png b/searx/static/themes/oscar/img/icons/wikipedia.png
index 37997fbc7..37997fbc7 100644
--- a/searx/static/oscar/img/icons/wikipedia.png
+++ b/searx/static/themes/oscar/img/icons/wikipedia.png
diff --git a/searx/static/oscar/img/icons/youtube.png b/searx/static/themes/oscar/img/icons/youtube.png
index ba2484d0f..ba2484d0f 100644
--- a/searx/static/oscar/img/icons/youtube.png
+++ b/searx/static/themes/oscar/img/icons/youtube.png
diff --git a/searx/static/oscar/img/loader.gif b/searx/static/themes/oscar/img/loader.gif
index 3980ff00b..3980ff00b 100644
--- a/searx/static/oscar/img/loader.gif
+++ b/searx/static/themes/oscar/img/loader.gif
diff --git a/searx/static/oscar/img/map/layers-2x.png b/searx/static/themes/oscar/img/map/layers-2x.png
index a2cf7f9ef..a2cf7f9ef 100644
--- a/searx/static/oscar/img/map/layers-2x.png
+++ b/searx/static/themes/oscar/img/map/layers-2x.png
diff --git a/searx/static/oscar/img/map/layers.png b/searx/static/themes/oscar/img/map/layers.png
index bca0a0e42..bca0a0e42 100644
--- a/searx/static/oscar/img/map/layers.png
+++ b/searx/static/themes/oscar/img/map/layers.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-green.png b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png
new file mode 100644
index 000000000..c359abb6c
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png
new file mode 100644
index 000000000..c3c863211
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-red.png b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png
new file mode 100644
index 000000000..1c26e9fc2
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png
diff --git a/searx/static/oscar/img/map/marker-icon-2x.png b/searx/static/themes/oscar/img/map/marker-icon-2x.png
index 0015b6495..0015b6495 100644
--- a/searx/static/oscar/img/map/marker-icon-2x.png
+++ b/searx/static/themes/oscar/img/map/marker-icon-2x.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-green.png b/searx/static/themes/oscar/img/map/marker-icon-green.png
new file mode 100644
index 000000000..56db5ea9f
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-green.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-orange.png b/searx/static/themes/oscar/img/map/marker-icon-orange.png
new file mode 100644
index 000000000..fbbce7b2a
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-orange.png
diff --git a/searx/static/themes/oscar/img/map/marker-icon-red.png b/searx/static/themes/oscar/img/map/marker-icon-red.png
new file mode 100644
index 000000000..3e64e06d1
--- /dev/null
+++ b/searx/static/themes/oscar/img/map/marker-icon-red.png
diff --git a/searx/static/oscar/img/map/marker-icon.png b/searx/static/themes/oscar/img/map/marker-icon.png
index e2e9f757f..e2e9f757f 100644
--- a/searx/static/oscar/img/map/marker-icon.png
+++ b/searx/static/themes/oscar/img/map/marker-icon.png
diff --git a/searx/static/oscar/img/map/marker-shadow.png b/searx/static/themes/oscar/img/map/marker-shadow.png
index d1e773c71..d1e773c71 100644
--- a/searx/static/oscar/img/map/marker-shadow.png
+++ b/searx/static/themes/oscar/img/map/marker-shadow.png
diff --git a/searx/static/oscar/img/searx_logo.png b/searx/static/themes/oscar/img/searx_logo.png
index 26be6def7..26be6def7 100644
--- a/searx/static/oscar/img/searx_logo.png
+++ b/searx/static/themes/oscar/img/searx_logo.png
diff --git a/searx/static/oscar/js/bootstrap.min.js b/searx/static/themes/oscar/js/bootstrap.min.js
index 7c1561a8b..7c1561a8b 100644
--- a/searx/static/oscar/js/bootstrap.min.js
+++ b/searx/static/themes/oscar/js/bootstrap.min.js
diff --git a/searx/static/oscar/js/html5shiv.min.js b/searx/static/themes/oscar/js/html5shiv.min.js
index d4c731ad5..d4c731ad5 100644
--- a/searx/static/oscar/js/html5shiv.min.js
+++ b/searx/static/themes/oscar/js/html5shiv.min.js
diff --git a/searx/static/oscar/js/jquery-1.11.1.min.js b/searx/static/themes/oscar/js/jquery-1.11.1.min.js
index ab28a2472..ab28a2472 100644
--- a/searx/static/oscar/js/jquery-1.11.1.min.js
+++ b/searx/static/themes/oscar/js/jquery-1.11.1.min.js
diff --git a/searx/static/oscar/js/leaflet-0.7.3.min.js b/searx/static/themes/oscar/js/leaflet-0.7.3.min.js
index 03434b77d..03434b77d 100644
--- a/searx/static/oscar/js/leaflet-0.7.3.min.js
+++ b/searx/static/themes/oscar/js/leaflet-0.7.3.min.js
diff --git a/searx/static/oscar/js/require-2.1.15.min.js b/searx/static/themes/oscar/js/require-2.1.15.min.js
index be103a74e..be103a74e 100644
--- a/searx/static/oscar/js/require-2.1.15.min.js
+++ b/searx/static/themes/oscar/js/require-2.1.15.min.js
diff --git a/searx/static/oscar/js/respond.min.js b/searx/static/themes/oscar/js/respond.min.js
index 80a7b69dc..80a7b69dc 100644
--- a/searx/static/oscar/js/respond.min.js
+++ b/searx/static/themes/oscar/js/respond.min.js
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
new file mode 100644
index 000000000..2015c4d6a
--- /dev/null
+++ b/searx/static/themes/oscar/js/searx.min.js
@@ -0,0 +1,2 @@
+/*! oscar/searx.min.js | 09-01-2015 | https://github.com/asciimoo/searx */
+requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),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(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(a,b):$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(b,c):$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var a=$(this).data("target"),b=$(a+" > iframe"),c=b.attr("src");(void 0===c||c===!1)&&b.attr("src",b.data("src"))}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||-1==i.indexOf(d)){switch(c+="<tr><td>"+d+"</td><td>",d){case"phone":case"fax":c+='<a href="tel:'+b.tags[d].replace(/ /g,"")+'">'+b.tags[d]+"</a>";break;case"email":c+='<a href="mailto:'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"website":case"url":c+='<a href="'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikidata":c+='<a href="https://www.wikidata.org/wiki/'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+='<a href="https://'+b.tags[d].substring(0,b.tags[d].indexOf(":"))+".wikipedia.org/wiki/"+b.tags[d].substring(b.tags[d].indexOf(":")+1)+'">'+b.tags[d]+"</a>";break}default:c+=b.tags[d]}c+="</td></tr>"}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'<p class="text-muted">could not load data!</p>')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',j=new L.TileLayer(h,{minZoom:1,maxZoom:19,attribution:i}),k="http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg",l='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',m=new L.TileLayer(k,{minZoom:1,maxZoom:18,subdomains:"1234",attribution:l}),n="http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg",o='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';new L.TileLayer(n,{minZoom:1,maxZoom:11,subdomains:"1234",attribution:o})}map_bounds?setTimeout(function(){a.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?a.setView(new L.LatLng(d,c),e):a.setView(new L.LatLng(d,c),8)),a.addLayer(m);var p={"OSM Mapnik":j,MapQuest:m};L.control.layers(p).addTo(a),g&&L.geoJson(g).addTo(a)}),$(this).off(a)})});
\ No newline at end of file
diff --git a/searx/static/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js
index 99ec4b585..1aa434902 100644
--- a/searx/static/oscar/js/searx_src/00_requirejs_config.js
+++ b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js
@@ -16,7 +16,7 @@
  */

 

 requirejs.config({

-    baseUrl: './static/oscar/js',

+    baseUrl: './static/themes/oscar/js',

     paths: {

         app: '../app'

     }

diff --git a/searx/static/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js
index 561bff35a..561bff35a 100644
--- a/searx/static/oscar/js/searx_src/autocompleter.js
+++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js
diff --git a/searx/static/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/js/searx_src/element_modifiers.js
index dd45b77e0..8e4280548 100644
--- a/searx/static/oscar/js/searx_src/element_modifiers.js
+++ b/searx/static/themes/oscar/js/searx_src/element_modifiers.js
@@ -63,6 +63,18 @@ $(document).ready(function(){
         $(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'));

+        }

+    });

     

     /**

      * Select or deselect every categories on double clic

diff --git a/searx/static/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
index b5112ef5e..cbcbe157e 100644
--- a/searx/static/oscar/js/searx_src/leaflet_map.js
+++ b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
@@ -116,7 +116,7 @@ $(document).ready(function(){
 

             // TODO hack

             // change default imagePath

-            L.Icon.Default.imagePath = 	"./static/oscar/img/map";

+            L.Icon.Default.imagePath = 	"./static/themes/oscar/img/map";

 

             // init map

             var map = L.map(leaflet_target);

diff --git a/searx/static/oscar/js/typeahead.bundle.min.js b/searx/static/themes/oscar/js/typeahead.bundle.min.js
index 11dcbf42e..11dcbf42e 100644
--- a/searx/static/oscar/js/typeahead.bundle.min.js
+++ b/searx/static/themes/oscar/js/typeahead.bundle.min.js
diff --git a/searx/static/oscar/less/bootstrap/.csscomb.json b/searx/static/themes/oscar/less/bootstrap/.csscomb.json
index 8456e41df..8456e41df 100644
--- a/searx/static/oscar/less/bootstrap/.csscomb.json
+++ b/searx/static/themes/oscar/less/bootstrap/.csscomb.json
diff --git a/searx/static/oscar/less/bootstrap/.csslintrc b/searx/static/themes/oscar/less/bootstrap/.csslintrc
index 005b86236..005b86236 100644
--- a/searx/static/oscar/less/bootstrap/.csslintrc
+++ b/searx/static/themes/oscar/less/bootstrap/.csslintrc
diff --git a/searx/static/oscar/less/bootstrap/alerts.less b/searx/static/themes/oscar/less/bootstrap/alerts.less
index df070b8ab..df070b8ab 100644
--- a/searx/static/oscar/less/bootstrap/alerts.less
+++ b/searx/static/themes/oscar/less/bootstrap/alerts.less
diff --git a/searx/static/oscar/less/bootstrap/badges.less b/searx/static/themes/oscar/less/bootstrap/badges.less
index 20624f30d..20624f30d 100644
--- a/searx/static/oscar/less/bootstrap/badges.less
+++ b/searx/static/themes/oscar/less/bootstrap/badges.less
diff --git a/searx/static/oscar/less/bootstrap/bootstrap.less b/searx/static/themes/oscar/less/bootstrap/bootstrap.less
index 79e7abd91..79e7abd91 100644
--- a/searx/static/oscar/less/bootstrap/bootstrap.less
+++ b/searx/static/themes/oscar/less/bootstrap/bootstrap.less
diff --git a/searx/static/oscar/less/bootstrap/breadcrumbs.less b/searx/static/themes/oscar/less/bootstrap/breadcrumbs.less
index cb01d503f..cb01d503f 100644
--- a/searx/static/oscar/less/bootstrap/breadcrumbs.less
+++ b/searx/static/themes/oscar/less/bootstrap/breadcrumbs.less
diff --git a/searx/static/oscar/less/bootstrap/button-groups.less b/searx/static/themes/oscar/less/bootstrap/button-groups.less
index 7021ecd17..7021ecd17 100644
--- a/searx/static/oscar/less/bootstrap/button-groups.less
+++ b/searx/static/themes/oscar/less/bootstrap/button-groups.less
diff --git a/searx/static/oscar/less/bootstrap/buttons.less b/searx/static/themes/oscar/less/bootstrap/buttons.less
index 492bdc65a..492bdc65a 100644
--- a/searx/static/oscar/less/bootstrap/buttons.less
+++ b/searx/static/themes/oscar/less/bootstrap/buttons.less
diff --git a/searx/static/oscar/less/bootstrap/carousel.less b/searx/static/themes/oscar/less/bootstrap/carousel.less
index 1644ddf7f..1644ddf7f 100644
--- a/searx/static/oscar/less/bootstrap/carousel.less
+++ b/searx/static/themes/oscar/less/bootstrap/carousel.less
diff --git a/searx/static/oscar/less/bootstrap/close.less b/searx/static/themes/oscar/less/bootstrap/close.less
index 9b4e74f2b..9b4e74f2b 100644
--- a/searx/static/oscar/less/bootstrap/close.less
+++ b/searx/static/themes/oscar/less/bootstrap/close.less
diff --git a/searx/static/oscar/less/bootstrap/code.less b/searx/static/themes/oscar/less/bootstrap/code.less
index baa13df61..baa13df61 100644
--- a/searx/static/oscar/less/bootstrap/code.less
+++ b/searx/static/themes/oscar/less/bootstrap/code.less
diff --git a/searx/static/oscar/less/bootstrap/component-animations.less b/searx/static/themes/oscar/less/bootstrap/component-animations.less
index 9400a0d32..9400a0d32 100644
--- a/searx/static/oscar/less/bootstrap/component-animations.less
+++ b/searx/static/themes/oscar/less/bootstrap/component-animations.less
diff --git a/searx/static/oscar/less/bootstrap/dropdowns.less b/searx/static/themes/oscar/less/bootstrap/dropdowns.less
index 3eb7fc05c..3eb7fc05c 100644
--- a/searx/static/oscar/less/bootstrap/dropdowns.less
+++ b/searx/static/themes/oscar/less/bootstrap/dropdowns.less
diff --git a/searx/static/oscar/less/bootstrap/forms.less b/searx/static/themes/oscar/less/bootstrap/forms.less
index 2c5e9bfa9..2c5e9bfa9 100644
--- a/searx/static/oscar/less/bootstrap/forms.less
+++ b/searx/static/themes/oscar/less/bootstrap/forms.less
diff --git a/searx/static/oscar/less/bootstrap/glyphicons.less b/searx/static/themes/oscar/less/bootstrap/glyphicons.less
index d3485dcb1..d3485dcb1 100644
--- a/searx/static/oscar/less/bootstrap/glyphicons.less
+++ b/searx/static/themes/oscar/less/bootstrap/glyphicons.less
diff --git a/searx/static/oscar/less/bootstrap/grid.less b/searx/static/themes/oscar/less/bootstrap/grid.less
index e100655b7..e100655b7 100644
--- a/searx/static/oscar/less/bootstrap/grid.less
+++ b/searx/static/themes/oscar/less/bootstrap/grid.less
diff --git a/searx/static/oscar/less/bootstrap/input-groups.less b/searx/static/themes/oscar/less/bootstrap/input-groups.less
index a8712f25b..a8712f25b 100644
--- a/searx/static/oscar/less/bootstrap/input-groups.less
+++ b/searx/static/themes/oscar/less/bootstrap/input-groups.less
diff --git a/searx/static/oscar/less/bootstrap/jumbotron.less b/searx/static/themes/oscar/less/bootstrap/jumbotron.less
index 27cd8b81d..27cd8b81d 100644
--- a/searx/static/oscar/less/bootstrap/jumbotron.less
+++ b/searx/static/themes/oscar/less/bootstrap/jumbotron.less
diff --git a/searx/static/oscar/less/bootstrap/labels.less b/searx/static/themes/oscar/less/bootstrap/labels.less
index 9a5a27006..9a5a27006 100644
--- a/searx/static/oscar/less/bootstrap/labels.less
+++ b/searx/static/themes/oscar/less/bootstrap/labels.less
diff --git a/searx/static/oscar/less/bootstrap/list-group.less b/searx/static/themes/oscar/less/bootstrap/list-group.less
index 1946bf59f..1946bf59f 100644
--- a/searx/static/oscar/less/bootstrap/list-group.less
+++ b/searx/static/themes/oscar/less/bootstrap/list-group.less
diff --git a/searx/static/oscar/less/bootstrap/media.less b/searx/static/themes/oscar/less/bootstrap/media.less
index 5ad22cd6d..5ad22cd6d 100644
--- a/searx/static/oscar/less/bootstrap/media.less
+++ b/searx/static/themes/oscar/less/bootstrap/media.less
diff --git a/searx/static/oscar/less/bootstrap/mixins.less b/searx/static/themes/oscar/less/bootstrap/mixins.less
index af4408fc2..af4408fc2 100644
--- a/searx/static/oscar/less/bootstrap/mixins.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/alerts.less b/searx/static/themes/oscar/less/bootstrap/mixins/alerts.less
index 396196f43..396196f43 100644
--- a/searx/static/oscar/less/bootstrap/mixins/alerts.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/alerts.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/background-variant.less b/searx/static/themes/oscar/less/bootstrap/mixins/background-variant.less
index 556e490d4..556e490d4 100644
--- a/searx/static/oscar/less/bootstrap/mixins/background-variant.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/background-variant.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/border-radius.less b/searx/static/themes/oscar/less/bootstrap/mixins/border-radius.less
index ca05dbf45..ca05dbf45 100644
--- a/searx/static/oscar/less/bootstrap/mixins/border-radius.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/border-radius.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/buttons.less b/searx/static/themes/oscar/less/bootstrap/mixins/buttons.less
index 409f8f20a..409f8f20a 100644
--- a/searx/static/oscar/less/bootstrap/mixins/buttons.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/buttons.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/center-block.less b/searx/static/themes/oscar/less/bootstrap/mixins/center-block.less
index d18d6de9e..d18d6de9e 100644
--- a/searx/static/oscar/less/bootstrap/mixins/center-block.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/center-block.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/clearfix.less b/searx/static/themes/oscar/less/bootstrap/mixins/clearfix.less
index 3f7a3820c..3f7a3820c 100644
--- a/searx/static/oscar/less/bootstrap/mixins/clearfix.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/clearfix.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/forms.less b/searx/static/themes/oscar/less/bootstrap/mixins/forms.less
index e36c4a8cf..e36c4a8cf 100644
--- a/searx/static/oscar/less/bootstrap/mixins/forms.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/forms.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/gradients.less b/searx/static/themes/oscar/less/bootstrap/mixins/gradients.less
index 0b88a89cc..0b88a89cc 100644
--- a/searx/static/oscar/less/bootstrap/mixins/gradients.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/gradients.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/grid-framework.less b/searx/static/themes/oscar/less/bootstrap/mixins/grid-framework.less
index 631785465..631785465 100644
--- a/searx/static/oscar/less/bootstrap/mixins/grid-framework.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/grid-framework.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/grid.less b/searx/static/themes/oscar/less/bootstrap/mixins/grid.less
index cae5eaff9..cae5eaff9 100644
--- a/searx/static/oscar/less/bootstrap/mixins/grid.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/grid.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/hide-text.less b/searx/static/themes/oscar/less/bootstrap/mixins/hide-text.less
index c2315e572..c2315e572 100644
--- a/searx/static/oscar/less/bootstrap/mixins/hide-text.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/hide-text.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/image.less b/searx/static/themes/oscar/less/bootstrap/mixins/image.less
index 5d2cccb27..5d2cccb27 100644
--- a/searx/static/oscar/less/bootstrap/mixins/image.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/image.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/labels.less b/searx/static/themes/oscar/less/bootstrap/mixins/labels.less
index 6f9e490b8..6f9e490b8 100644
--- a/searx/static/oscar/less/bootstrap/mixins/labels.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/labels.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/list-group.less b/searx/static/themes/oscar/less/bootstrap/mixins/list-group.less
index 8b5b065cb..8b5b065cb 100644
--- a/searx/static/oscar/less/bootstrap/mixins/list-group.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/list-group.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/nav-divider.less b/searx/static/themes/oscar/less/bootstrap/mixins/nav-divider.less
index feb1e9ed0..feb1e9ed0 100644
--- a/searx/static/oscar/less/bootstrap/mixins/nav-divider.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/nav-divider.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/nav-vertical-align.less b/searx/static/themes/oscar/less/bootstrap/mixins/nav-vertical-align.less
index d458c7861..d458c7861 100644
--- a/searx/static/oscar/less/bootstrap/mixins/nav-vertical-align.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/nav-vertical-align.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/opacity.less b/searx/static/themes/oscar/less/bootstrap/mixins/opacity.less
index 33ed25ce6..33ed25ce6 100644
--- a/searx/static/oscar/less/bootstrap/mixins/opacity.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/opacity.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/pagination.less b/searx/static/themes/oscar/less/bootstrap/mixins/pagination.less
index 7deb505d2..7deb505d2 100644
--- a/searx/static/oscar/less/bootstrap/mixins/pagination.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/pagination.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/panels.less b/searx/static/themes/oscar/less/bootstrap/mixins/panels.less
index 49ee10d4a..49ee10d4a 100644
--- a/searx/static/oscar/less/bootstrap/mixins/panels.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/panels.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/progress-bar.less b/searx/static/themes/oscar/less/bootstrap/mixins/progress-bar.less
index f07996a34..f07996a34 100644
--- a/searx/static/oscar/less/bootstrap/mixins/progress-bar.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/progress-bar.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/reset-filter.less b/searx/static/themes/oscar/less/bootstrap/mixins/reset-filter.less
index 68cdb5e18..68cdb5e18 100644
--- a/searx/static/oscar/less/bootstrap/mixins/reset-filter.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/reset-filter.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/resize.less b/searx/static/themes/oscar/less/bootstrap/mixins/resize.less
index 3acd3afdb..3acd3afdb 100644
--- a/searx/static/oscar/less/bootstrap/mixins/resize.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/resize.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/responsive-visibility.less b/searx/static/themes/oscar/less/bootstrap/mixins/responsive-visibility.less
index f7951c3d7..f7951c3d7 100644
--- a/searx/static/oscar/less/bootstrap/mixins/responsive-visibility.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/responsive-visibility.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/size.less b/searx/static/themes/oscar/less/bootstrap/mixins/size.less
index a8be65089..a8be65089 100644
--- a/searx/static/oscar/less/bootstrap/mixins/size.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/size.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/tab-focus.less b/searx/static/themes/oscar/less/bootstrap/mixins/tab-focus.less
index 1f1f05ab0..1f1f05ab0 100644
--- a/searx/static/oscar/less/bootstrap/mixins/tab-focus.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/tab-focus.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/table-row.less b/searx/static/themes/oscar/less/bootstrap/mixins/table-row.less
index 0f287f1a8..0f287f1a8 100644
--- a/searx/static/oscar/less/bootstrap/mixins/table-row.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/table-row.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/text-emphasis.less b/searx/static/themes/oscar/less/bootstrap/mixins/text-emphasis.less
index 0868ef9f2..0868ef9f2 100644
--- a/searx/static/oscar/less/bootstrap/mixins/text-emphasis.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/text-emphasis.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/text-overflow.less b/searx/static/themes/oscar/less/bootstrap/mixins/text-overflow.less
index c11ad2fb7..c11ad2fb7 100644
--- a/searx/static/oscar/less/bootstrap/mixins/text-overflow.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/text-overflow.less
diff --git a/searx/static/oscar/less/bootstrap/mixins/vendor-prefixes.less b/searx/static/themes/oscar/less/bootstrap/mixins/vendor-prefixes.less
index e2008c8b2..e2008c8b2 100644
--- a/searx/static/oscar/less/bootstrap/mixins/vendor-prefixes.less
+++ b/searx/static/themes/oscar/less/bootstrap/mixins/vendor-prefixes.less
diff --git a/searx/static/oscar/less/bootstrap/modals.less b/searx/static/themes/oscar/less/bootstrap/modals.less
index 6da50ba92..6da50ba92 100644
--- a/searx/static/oscar/less/bootstrap/modals.less
+++ b/searx/static/themes/oscar/less/bootstrap/modals.less
diff --git a/searx/static/oscar/less/bootstrap/navbar.less b/searx/static/themes/oscar/less/bootstrap/navbar.less
index 55bfd2942..55bfd2942 100644
--- a/searx/static/oscar/less/bootstrap/navbar.less
+++ b/searx/static/themes/oscar/less/bootstrap/navbar.less
diff --git a/searx/static/oscar/less/bootstrap/navs.less b/searx/static/themes/oscar/less/bootstrap/navs.less
index 98a64307a..98a64307a 100644
--- a/searx/static/oscar/less/bootstrap/navs.less
+++ b/searx/static/themes/oscar/less/bootstrap/navs.less
diff --git a/searx/static/oscar/less/bootstrap/normalize.less b/searx/static/themes/oscar/less/bootstrap/normalize.less
index ce04b6a2f..ce04b6a2f 100644
--- a/searx/static/oscar/less/bootstrap/normalize.less
+++ b/searx/static/themes/oscar/less/bootstrap/normalize.less
diff --git a/searx/static/oscar/less/bootstrap/pager.less b/searx/static/themes/oscar/less/bootstrap/pager.less
index 59103f445..59103f445 100644
--- a/searx/static/oscar/less/bootstrap/pager.less
+++ b/searx/static/themes/oscar/less/bootstrap/pager.less
diff --git a/searx/static/oscar/less/bootstrap/pagination.less b/searx/static/themes/oscar/less/bootstrap/pagination.less
index b2856ae60..b2856ae60 100644
--- a/searx/static/oscar/less/bootstrap/pagination.less
+++ b/searx/static/themes/oscar/less/bootstrap/pagination.less
diff --git a/searx/static/oscar/less/bootstrap/panels.less b/searx/static/themes/oscar/less/bootstrap/panels.less
index 2dc21316d..2dc21316d 100644
--- a/searx/static/oscar/less/bootstrap/panels.less
+++ b/searx/static/themes/oscar/less/bootstrap/panels.less
diff --git a/searx/static/oscar/less/bootstrap/popovers.less b/searx/static/themes/oscar/less/bootstrap/popovers.less
index bf6af40a0..bf6af40a0 100644
--- a/searx/static/oscar/less/bootstrap/popovers.less
+++ b/searx/static/themes/oscar/less/bootstrap/popovers.less
diff --git a/searx/static/oscar/less/bootstrap/print.less b/searx/static/themes/oscar/less/bootstrap/print.less
index 3655d0395..3655d0395 100644
--- a/searx/static/oscar/less/bootstrap/print.less
+++ b/searx/static/themes/oscar/less/bootstrap/print.less
diff --git a/searx/static/oscar/less/bootstrap/progress-bars.less b/searx/static/themes/oscar/less/bootstrap/progress-bars.less
index 3ac52a29e..3ac52a29e 100644
--- a/searx/static/oscar/less/bootstrap/progress-bars.less
+++ b/searx/static/themes/oscar/less/bootstrap/progress-bars.less
diff --git a/searx/static/oscar/less/bootstrap/responsive-embed.less b/searx/static/themes/oscar/less/bootstrap/responsive-embed.less
index a884d49fe..a884d49fe 100644
--- a/searx/static/oscar/less/bootstrap/responsive-embed.less
+++ b/searx/static/themes/oscar/less/bootstrap/responsive-embed.less
diff --git a/searx/static/oscar/less/bootstrap/responsive-utilities.less b/searx/static/themes/oscar/less/bootstrap/responsive-utilities.less
index b1db31d7b..b1db31d7b 100644
--- a/searx/static/oscar/less/bootstrap/responsive-utilities.less
+++ b/searx/static/themes/oscar/less/bootstrap/responsive-utilities.less
diff --git a/searx/static/oscar/less/bootstrap/scaffolding.less b/searx/static/themes/oscar/less/bootstrap/scaffolding.less
index c1e270fb7..c1e270fb7 100644
--- a/searx/static/oscar/less/bootstrap/scaffolding.less
+++ b/searx/static/themes/oscar/less/bootstrap/scaffolding.less
diff --git a/searx/static/oscar/less/bootstrap/tables.less b/searx/static/themes/oscar/less/bootstrap/tables.less
index 2e1ef337b..2e1ef337b 100644
--- a/searx/static/oscar/less/bootstrap/tables.less
+++ b/searx/static/themes/oscar/less/bootstrap/tables.less
diff --git a/searx/static/oscar/less/bootstrap/theme.less b/searx/static/themes/oscar/less/bootstrap/theme.less
index b089424cf..b089424cf 100644
--- a/searx/static/oscar/less/bootstrap/theme.less
+++ b/searx/static/themes/oscar/less/bootstrap/theme.less
diff --git a/searx/static/oscar/less/bootstrap/thumbnails.less b/searx/static/themes/oscar/less/bootstrap/thumbnails.less
index c428920bc..c428920bc 100644
--- a/searx/static/oscar/less/bootstrap/thumbnails.less
+++ b/searx/static/themes/oscar/less/bootstrap/thumbnails.less
diff --git a/searx/static/oscar/less/bootstrap/tooltip.less b/searx/static/themes/oscar/less/bootstrap/tooltip.less
index bd626996f..bd626996f 100644
--- a/searx/static/oscar/less/bootstrap/tooltip.less
+++ b/searx/static/themes/oscar/less/bootstrap/tooltip.less
diff --git a/searx/static/oscar/less/bootstrap/type.less b/searx/static/themes/oscar/less/bootstrap/type.less
index 9b1e48bae..9b1e48bae 100644
--- a/searx/static/oscar/less/bootstrap/type.less
+++ b/searx/static/themes/oscar/less/bootstrap/type.less
diff --git a/searx/static/oscar/less/bootstrap/typeahead.less b/searx/static/themes/oscar/less/bootstrap/typeahead.less
index 91e391b41..91e391b41 100644
--- a/searx/static/oscar/less/bootstrap/typeahead.less
+++ b/searx/static/themes/oscar/less/bootstrap/typeahead.less
diff --git a/searx/static/oscar/less/bootstrap/utilities.less b/searx/static/themes/oscar/less/bootstrap/utilities.less
index c0becabe3..c0becabe3 100644
--- a/searx/static/oscar/less/bootstrap/utilities.less
+++ b/searx/static/themes/oscar/less/bootstrap/utilities.less
diff --git a/searx/static/oscar/less/bootstrap/variables.less b/searx/static/themes/oscar/less/bootstrap/variables.less
index 582f0f8d3..582f0f8d3 100644
--- a/searx/static/oscar/less/bootstrap/variables.less
+++ b/searx/static/themes/oscar/less/bootstrap/variables.less
diff --git a/searx/static/oscar/less/bootstrap/wells.less b/searx/static/themes/oscar/less/bootstrap/wells.less
index 15d072b0c..15d072b0c 100644
--- a/searx/static/oscar/less/bootstrap/wells.less
+++ b/searx/static/themes/oscar/less/bootstrap/wells.less
diff --git a/searx/static/oscar/less/oscar/checkbox.less b/searx/static/themes/oscar/less/oscar/checkbox.less
index 712e53d49..712e53d49 100644
--- a/searx/static/oscar/less/oscar/checkbox.less
+++ b/searx/static/themes/oscar/less/oscar/checkbox.less
diff --git a/searx/static/oscar/less/oscar/code.less b/searx/static/themes/oscar/less/oscar/code.less
index 90a2cd60c..90a2cd60c 100644
--- a/searx/static/oscar/less/oscar/code.less
+++ b/searx/static/themes/oscar/less/oscar/code.less
diff --git a/searx/static/oscar/less/oscar/cursor.less b/searx/static/themes/oscar/less/oscar/cursor.less
index cbc1ea6fc..cbc1ea6fc 100644
--- a/searx/static/oscar/less/oscar/cursor.less
+++ b/searx/static/themes/oscar/less/oscar/cursor.less
diff --git a/searx/static/oscar/less/oscar/footer.less b/searx/static/themes/oscar/less/oscar/footer.less
index 0b25e735f..0b25e735f 100644
--- a/searx/static/oscar/less/oscar/footer.less
+++ b/searx/static/themes/oscar/less/oscar/footer.less
diff --git a/searx/static/oscar/less/oscar/infobox.less b/searx/static/themes/oscar/less/oscar/infobox.less
index c6a6d4248..c6a6d4248 100644
--- a/searx/static/oscar/less/oscar/infobox.less
+++ b/searx/static/themes/oscar/less/oscar/infobox.less
diff --git a/searx/static/oscar/less/oscar/oscar.less b/searx/static/themes/oscar/less/oscar/oscar.less
index 6a8478530..6a8478530 100644
--- a/searx/static/oscar/less/oscar/oscar.less
+++ b/searx/static/themes/oscar/less/oscar/oscar.less
diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/themes/oscar/less/oscar/results.less
index cea8f3b41..cea8f3b41 100644
--- a/searx/static/oscar/less/oscar/results.less
+++ b/searx/static/themes/oscar/less/oscar/results.less
diff --git a/searx/static/oscar/less/oscar/search.less b/searx/static/themes/oscar/less/oscar/search.less
index f95ab50d4..f95ab50d4 100644
--- a/searx/static/oscar/less/oscar/search.less
+++ b/searx/static/themes/oscar/less/oscar/search.less
diff --git a/searx/static/oscar/package.json b/searx/static/themes/oscar/package.json
index 7eae9df2b..7eae9df2b 100644
--- a/searx/static/oscar/package.json
+++ b/searx/static/themes/oscar/package.json