diff --git a/searx/static/themes/default/css/style.css b/searx/static/themes/default/css/style.css
index 277f55e8d..1311fbe79 100644
--- a/searx/static/themes/default/css/style.css
+++ b/searx/static/themes/default/css/style.css
@@ -1,86 +1 @@
-html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}
-body,#container{padding:0;margin:0}
-#container{width:100%;position:absolute;top:0}
-.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}
-.search .checkbox_container label:hover{border-bottom:2px solid #3498db}
-.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}
-#search_wrapper{position:relative;width:50em;padding:10px}
-.center #search_wrapper{margin-left:auto;margin-right:auto}
-.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}
-#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}
-@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}
-ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}
-.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}
-.row p{padding:0 10px;max-width:700px}
-.row h3,.row ul{margin:4px 8px}
-.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}
-a:link.hmarg{color:#3498db}
-a:visited.hmarg{color:#3498db}
-a:active.hmarg{color:#3498db}
-a:hover.hmarg{color:#3498db}
-.top_margin{margin-top:60px}
-.center{text-align:center}
-h1{font-size:5em}
-div.title{background:url('../img/searx.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}
-input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}
-input[type="checkbox"]{visibility:hidden}
-fieldset{margin:8px;border:1px solid #3498db}
-#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
-.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}
-.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
-.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}
-.engine_checkbox{padding:4px}
-label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}
-label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}
-.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}
-.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}
-a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}
-.result{margin:19px 0 18px 0;padding:0;clear:both}
-.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}
-.result_title a:visited{color:#8e44ad}
-.cache_link{font-size:10px !important}
-.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}
-.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}
-.result .content br.last{clear:both}
-.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}
-.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}
-.result .thumbnail{width:400px}
-.engines{color:#888}
-.small_font{font-size:.8em}
-.small p{margin:2px 0}
-.right{float:right}
-.invisible{display:none}
-.left{float:left}
-.highlight{color:#094089}
-.content .highlight{color:#000}
-.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}
-.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}
-.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}
-.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}
-.definition_result{border-left:10px solid #808080;padding-left:3px}
-.percentage{position:relative;width:300px}.percentage div{background:#444}
-table{width:100%}
-td{padding:0 4px}
-tr:hover{background:#ddd}
-#results{margin:auto;padding:0;width:50em;margin-bottom:20px}
-#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}
-#sidebar input[type="submit"]{text-decoration:underline}
-#suggestions form{display:inline}
-#suggestions,#answers{margin-top:20px;max-width:45em}
-#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}
-#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}
-#answers form,#infoboxes form{min-width:210px}
-#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em;}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}
-#infoboxes .infobox h2{margin:0}
-#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}
-#infoboxes .infobox input{font-size:1em}
-#infoboxes .infobox br{clear:both}
-#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}
-#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}
-#pagination{clear:both}#pagination br{clear:both}
-#apis{margin-top:8px;clear:both}
-#categories_container{position:relative}
-@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%} .github{display:none} .checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0} .preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em} html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto} #categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #suggestions,#answers{margin-top:5px} #infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em} #categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0} #apis{display:none} #search_url{display:none} .result{border-top:1px solid #e8e7e6;margin:8px 0 8px 0}.result .thumbnail{max-width:98%} .image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}
-.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}
-.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:#fff;transition:opacity 1s ease}
-#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8}
+html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}.search .checkbox_container label:hover{border-bottom:2px solid #3498db}.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.result{margin:19px 0 18px 0;padding:0;clear:both}.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}.result_title a:visited{color:#8e44ad}.cache_link{font-size:10px !important}.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .content br.last{clear:both}.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}.result .thumbnail{width:400px}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}.torrent_result{border-left:10px solid lightgray;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.torrent_result a{color:#2980b9}.torrent_result a:hover{text-decoration:underline}.torrent_result a:visited{color:#8e44ad}.definition_result{border-left:10px solid gray;padding-left:3px}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#sidebar input[type="submit"]{text-decoration:underline}#suggestions form{display:inline}#suggestions,#answers{margin-top:20px;max-width:45em}#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}#suggestions-title{color:#888}#answers{border:2px solid #2980b9;padding:20px}#answers form,#infoboxes form{min-width:210px}#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#infoboxes .infobox br{clear:both}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#pagination br{clear:both}#apis{margin-top:8px;clear:both}#categories_container{position:relative}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#suggestions,#answers{margin-top:5px}#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis{display:none}#search_url{display:none}.result{border-top:1px solid #e8e7e6;margin:8px 0 8px 0}.result .thumbnail{max-width:98%}.image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:white;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8}
\ No newline at end of file
diff --git a/searx/static/themes/default/img/icons/icon_500px.ico b/searx/static/themes/default/img/icons/icon_500px.ico
new file mode 100644
index 000000000..b01aa20b5
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_500px.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_bing.ico b/searx/static/themes/default/img/icons/icon_bing.ico
new file mode 100644
index 000000000..5702749c1
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_bing.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_deezer.ico b/searx/static/themes/default/img/icons/icon_deezer.ico
new file mode 100644
index 000000000..d38c9b1f6
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_deezer.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_digg.ico b/searx/static/themes/default/img/icons/icon_digg.ico
new file mode 100644
index 000000000..162e57038
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_digg.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_duckduckgo.ico b/searx/static/themes/default/img/icons/icon_duckduckgo.ico
new file mode 100644
index 000000000..d093082cb
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_duckduckgo.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_flickr.ico b/searx/static/themes/default/img/icons/icon_flickr.ico
new file mode 100644
index 000000000..e2304c587
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_flickr.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_google play apps.ico b/searx/static/themes/default/img/icons/icon_google play apps.ico
new file mode 100644
index 000000000..74c84470b
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_google play apps.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_google play movies.ico b/searx/static/themes/default/img/icons/icon_google play movies.ico
new file mode 100644
index 000000000..74c84470b
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_google play movies.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_google play music.ico b/searx/static/themes/default/img/icons/icon_google play music.ico
new file mode 100644
index 000000000..74c84470b
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_google play music.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_google.ico b/searx/static/themes/default/img/icons/icon_google.ico
new file mode 100644
index 000000000..f594697d2
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_google.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_openstreetmap.ico b/searx/static/themes/default/img/icons/icon_openstreetmap.ico
new file mode 100644
index 000000000..b65863656
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_openstreetmap.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_searchcode.ico b/searx/static/themes/default/img/icons/icon_searchcode.ico
new file mode 100644
index 000000000..dc099ef70
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_searchcode.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_startpage.ico b/searx/static/themes/default/img/icons/icon_startpage.ico
new file mode 100644
index 000000000..44b94a986
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_startpage.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_subtitleseeker.ico b/searx/static/themes/default/img/icons/icon_subtitleseeker.ico
new file mode 100644
index 000000000..9a0565558
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_subtitleseeker.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_wikipedia.ico b/searx/static/themes/default/img/icons/icon_wikipedia.ico
index 911fa76f6..e70021849 100644
Binary files a/searx/static/themes/default/img/icons/icon_wikipedia.ico and b/searx/static/themes/default/img/icons/icon_wikipedia.ico differ
diff --git a/searx/static/themes/default/img/icons/icon_yahoo.ico b/searx/static/themes/default/img/icons/icon_yahoo.ico
new file mode 100644
index 000000000..9bd1d9f7c
Binary files /dev/null and b/searx/static/themes/default/img/icons/icon_yahoo.ico differ
diff --git a/searx/static/themes/default/less/definitions.less b/searx/static/themes/default/less/definitions.less
index 3e0b6579d..0ac0cc90c 100644
--- a/searx/static/themes/default/less/definitions.less
+++ b/searx/static/themes/default/less/definitions.less
@@ -15,6 +15,9 @@
/// General
@color-font: #444;
+@color-font-light: #888;
+
+@color-red: #C0392B;
@color-url-font: #1a11be;
@color-url-visited-font: #8E44AD;
@@ -44,6 +47,9 @@
@color-autocompleter-choices-font: #444;
+/// Answers
+@color-answers-border: @color-base-dark;
+
// Selected
@color-autocompleter-selected-background: #444;
@color-autocompleter-selected-font: #FFF;
@@ -78,10 +84,10 @@
@color-result-link-visited-font: @color-url-visited-font;
// Url to result
-@color-result-url-font: #C0392B;
+@color-result-url-font: @color-red;
// Publish Date
-@color-result-publishdate-font: #888;
+@color-result-publishdate-font: @color-font-light;
// Images
@color-result-image-span-background-hover: rgba(0, 0, 0, 0.6);
@@ -109,5 +115,5 @@
/// Other
-@color-engines-font: #888;
+@color-engines-font: @color-font-light;
@color-percentage-div-background: #444;
diff --git a/searx/static/themes/default/less/style.less b/searx/static/themes/default/less/style.less
index 9851b1305..c47ca68cf 100644
--- a/searx/static/themes/default/less/style.less
+++ b/searx/static/themes/default/less/style.less
@@ -342,6 +342,18 @@ a {
margin: 3px;
font-size: 0.8em;
}
+
+ a {
+ color: @color-result-link-font;
+
+ &:hover {
+ text-decoration: underline;
+ }
+
+ &:visited {
+ color: @color-result-link-visited-font;
+ }
+ }
}
.definition_result {
@@ -434,6 +446,20 @@ tr {
}
+#suggestions-title {
+
+color: @color-font-light;
+
+
+}
+
+#answers {
+
+ border: 2px solid @color-answers-border;
+ padding: 20px;
+
+}
+
#answers, #infoboxes {
form {
min-width: 210px;
diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html
index bc7f0972e..4bca6a7e0 100644
--- a/searx/templates/default/base.html
+++ b/searx/templates/default/base.html
@@ -1,33 +1,34 @@
-
-
-
-
-
-
- {% block title %}{% endblock %}searx
-
-
- {% block styles %}
- {% endblock %}
- {% block head %}
-
- {% endblock %}
-
-
-
-{% block content %}
-{% endblock %}
-{% if autocomplete %}
-
-
-{% endif %}
-
-
-
-
+
+
+
+
+
+
+ {% block title %}{% endblock %}searx
+
+
+ {% block styles %}
+ {% endblock %}
+ {% block meta %}{% endblock %}
+ {% block head %}
+
+ {% endblock %}
+
+
+
+ {% block content %}
+ {% endblock %}
+ {% if autocomplete %}
+
+
+ {% endif %}
+
+
+
+
diff --git a/searx/templates/default/categories.html b/searx/templates/default/categories.html
index 017898ea7..1c466781b 100644
--- a/searx/templates/default/categories.html
+++ b/searx/templates/default/categories.html
@@ -1,10 +1,10 @@
-{% for category in categories %}
+ {% for category in categories %}
-{% endfor %}
-
{{ _('Click on the magnifier to perform search') }}
+ {% endfor %}
+ {% if display_tooltip %}
{{ _('Click on the magnifier to perform search') }}
{% endif %}
diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html
index d3ff8f06d..1511cae06 100644
--- a/searx/templates/default/infobox.html
+++ b/searx/templates/default/infobox.html
@@ -1,44 +1,44 @@
-
{{ infobox.infobox }}
- {% if infobox.img_src %}
{% endif %}
-
{{ infobox.entity }}
-
{{ infobox.content | safe }}
- {% if infobox.attributes %}
-
-
- {% for attribute in infobox.attributes %}
- | {{ attribute.label }} | {{ attribute.value }} |
- {% endfor %}
-
-
- {% endif %}
+
{{ infobox.infobox }}
+ {% if infobox.img_src %}
{% endif %}
+
{{ infobox.entity }}
+
{{ infobox.content | safe }}
+ {% if infobox.attributes %}
+
+
+ {% for attribute in infobox.attributes %}
+ | {{ attribute.label }} | {{ attribute.value }} |
+ {% endfor %}
+
+
+ {% endif %}
- {% if infobox.urls %}
-
- {% endif %}
+ {% if infobox.urls %}
+
+ {% endif %}
- {% if infobox.relatedTopics %}
-
- {% endif %}
+ {% if infobox.relatedTopics %}
+
+ {% endif %}
-
+
{% if "icon_"~result.engine~".ico" in favicons %} }})
{% endif %}{{ result.title|safe }}
-
{{ result.pretty_url }} cached
- {% if result.publishedDate %}
{{ result.publishedDate }}
{% endif %}
+
{{ result.pretty_url }} cached
+ {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}
{% if result.img_src %}
{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}
diff --git a/searx/templates/default/result_templates/images.html b/searx/templates/default/result_templates/images.html
index 4c6d59e01..9cb82ba51 100644
--- a/searx/templates/default/result_templates/images.html
+++ b/searx/templates/default/result_templates/images.html
@@ -1,6 +1,6 @@
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index d37c2f374..59885a58c 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,13 +1,13 @@
- {% if "icon_"~result.engine~".ico" in favicons %}
+ {% if "icon_"~result.engine~".ico" in favicons %}
- {% endif %}
+ {% endif %}
-
-
-
{{ result.pretty_url }} cached
- {% if result.publishedDate %}
{{ result.publishedDate }}
{% endif %}
-
{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}
-
+
+
+
{{ result.pretty_url }} cached
+ {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}
+
{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}
+
{{ result.pretty_url }}
{% if result.content %}{{ result.content|safe }}
{% endif %}
- magnet link - Seed: {{ result.seed }}, Leech: {{ result.leech }}
+
+ {% if result.magnetlink %}{{ _('magnet link') }}{% endif %}
+ {% if result.torrentfile %}{{ _('torrent file') }}{% endif %} -
+ {{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}
+
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 75f965c80..ef6a1f505 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,6 +1,6 @@
{% if "icon_"~result.engine~".ico" in favicons %}{% endif %}{{ result.title|safe }}
- {% if result.publishedDate %}
{{ result.publishedDate }}
{% endif %}
-
-
{{ result.url }}
+ {% if result.publishedDate %}
{{ result.publishedDate }}{% endif %}
+
+
{{ result.url }}
diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index 822960593..c83bf5c5d 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -1,5 +1,6 @@
{% extends "default/base.html" %}
{% block title %}{{ q }} - {% endblock %}
+{% block meta %}{% endblock %}
{% block content %}
@@ -39,12 +40,14 @@
{% endif %}
{% if suggestions %}
-
{{ _('Suggestions') }}
+
{{ _('Suggestions') }} :
+ {% set first = true %}
{% for suggestion in suggestions %}
-
+ {% set first = false %}
{% endfor %}
{% endif %}
@@ -55,7 +58,7 @@
{% include 'default/infobox.html' %}
{% endfor %}
- {% endif %}
+ {% endif %}
{% for result in results %}
{% if result['template'] %}
@@ -81,12 +84,12 @@
{% endif %}
diff --git a/searx/templates/default/search.html b/searx/templates/default/search.html
index 75cfa41d6..5a049a492 100644
--- a/searx/templates/default/search.html
+++ b/searx/templates/default/search.html
@@ -1,7 +1,8 @@