diff --git a/searx/static/themes/etheme/css/etheme.css b/searx/static/themes/etheme/css/etheme.css
index 98c5d0835c662c5a8740b744ebcb81951c3f2edb..378f41ab18a6d85c195bd78467279b5d1f6b5948 100644
--- a/searx/static/themes/etheme/css/etheme.css
+++ b/searx/static/themes/etheme/css/etheme.css
@@ -754,17 +754,18 @@ input:checked + .slider:before {
 #search_form #categories {
   text-transform: capitalize;
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   align-items: center;
   position: relative;
   flex: 100%;
+  gap: 16px;
+  height: 80%;
 }
 #search_form .search_categories label,
 #search_form #categories label {
   flex-basis: auto;
   font-size: 14px;
   font-weight: normal;
-  margin-right: 16px;
   cursor: pointer;
 }
 #search_form .search_categories input[type="checkbox"]:checked + label,
@@ -835,7 +836,6 @@ input:checked + .slider:before {
   }
   #search_form #search_params #time_and_lang {
     display: flex;
-    margin-left: 32px;
   }
   #search_form #search_params #time_and_lang > * {
     width: auto;
@@ -978,6 +978,7 @@ input:checked + .slider:before {
 .result .external-link {
   font-size: 14px;
   color: var(--color-success);
+  word-break: break-word;
 }
 .result .extra-info {
   color: var(--text-muted-normal-alpha);
diff --git a/searx/static/themes/etheme/css/etheme.min.css b/searx/static/themes/etheme/css/etheme.min.css
index 75342a247f9d8e78a3b4c54b2d88cc6505b732df..be2a65193fea6f9b43266721ee91ba9d50e053e7 100644
Binary files a/searx/static/themes/etheme/css/etheme.min.css and b/searx/static/themes/etheme/css/etheme.min.css differ
diff --git a/searx/static/themes/etheme/less/etheme/results.less b/searx/static/themes/etheme/less/etheme/results.less
index f840ee71a2072de548e0bec84cec1d82534c3626..a35046a1d8230ceb4bc53b922af642ed99768251 100644
--- a/searx/static/themes/etheme/less/etheme/results.less
+++ b/searx/static/themes/etheme/less/etheme/results.less
@@ -113,6 +113,7 @@
   .external-link {
     font-size: @fontsize_small;
     color: var(--color-success);
+    word-break: break-word;
   }
 
   .extra-info {
diff --git a/searx/static/themes/etheme/less/etheme/search.less b/searx/static/themes/etheme/less/etheme/search.less
index 74d751ce863d7fc2d64a3f66e6a91c2904728efa..89c0de70ea2f5a1b962686ae8ef1db1dd9e45a0c 100644
--- a/searx/static/themes/etheme/less/etheme/search.less
+++ b/searx/static/themes/etheme/less/etheme/search.less
@@ -115,7 +115,7 @@
     justify-content: space-between;
     font-size: @fontsize_small;
     padding-bottom: @spacing_large;
-    padding-top: @spacing_large;
+    padding-top: @spacing_x-large;
     padding-left: @spacing_x-large;
     padding-right: @spacing_x-large;
 
@@ -133,20 +133,20 @@
     
   }
 
-
   .search_categories, #categories {
     text-transform: capitalize;
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     align-items: center;
     position: relative;
     flex: 100%;
+    gap: @spacing_large;
+    height: 80%;
   
     label {
       flex-basis: auto;
       font-size: @fontsize_small;
       font-weight: normal;
-      margin-right: @spacing_large;
       cursor: pointer;
     }
   
@@ -208,7 +208,6 @@
 
       #time_and_lang { 
         display: flex;
-        margin-left: @spacing_xx-large;
         > * { width: auto; }
       }
     }
diff --git a/searx/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css
index 6854472b12140604729e543cbdfd3ab9948d2b03..4dee36c3d46e34253fbcc0bdcafae6b76e089c5a 100644
--- a/searx/static/themes/simple/css/searx-rtl.css
+++ b/searx/static/themes/simple/css/searx-rtl.css
@@ -1,4 +1,4 @@
-/*! searx | 21-10-2021 | https://github.com/searx/searx */
+/*! searx | 26-10-2021 | https://github.com/searx/searx */
 /*
 * searx, A privacy-respecting, hackable metasearch engine
 *
diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css
index 62c311355b8a4154a5c91e7243355d90a231d895..e4447b619530eb3b6e3c005df3ec87030d6732ff 100644
Binary files a/searx/static/themes/simple/css/searx-rtl.min.css and b/searx/static/themes/simple/css/searx-rtl.min.css differ
diff --git a/searx/static/themes/simple/css/searx.css b/searx/static/themes/simple/css/searx.css
index efcdd48a7ea6548864e206b7e6c1ff3b1b1d2a1e..b8c9ec3123aa95417dbddb6b12c5d48f44f7a509 100644
--- a/searx/static/themes/simple/css/searx.css
+++ b/searx/static/themes/simple/css/searx.css
@@ -1,4 +1,4 @@
-/*! searx | 21-10-2021 | https://github.com/searx/searx */
+/*! searx | 26-10-2021 | https://github.com/searx/searx */
 /*
 * searx, A privacy-respecting, hackable metasearch engine
 *
diff --git a/searx/static/themes/simple/css/searx.min.css b/searx/static/themes/simple/css/searx.min.css
index c984778957a83ae771672c0695fc26a19f222c3b..d4b41c1512997f089dd8b395c1af017741c3d39b 100644
Binary files a/searx/static/themes/simple/css/searx.min.css and b/searx/static/themes/simple/css/searx.min.css differ
diff --git a/searx/templates/etheme/components/categories.html b/searx/templates/etheme/components/categories.html
index 4cdd6786c02a0ac6c751b9b6b68ddd0d25de458e..7c2f65fbdfdfe1d2dfa6c34c1590c9f54e783943 100644
--- a/searx/templates/etheme/components/categories.html
+++ b/searx/templates/etheme/components/categories.html
@@ -4,26 +4,34 @@
 {%- endmacro -%}
 
 {% set main_categories = ["general", "images", "videos", "news"] %}
-
-<div id="categories" {% if rtl %} class="rtl" {% endif %}>
-    {% for category in categories %}
-        {% if category in main_categories + selected_categories %}
-            {{ category_widget(category) }}
-        {% endif %}
-    {% endfor %}
-
-    <div id="more_categories_container">
-        <input type="checkbox" name="more_categories_toggle" id="more_categories_toggle" class="hidden">
-        <label for="more_categories_toggle" id="show_more_categories">{{_("More")}}</label>
-        <label for="more_categories_toggle" id="show_less_categories">{{_("Less")}}</label>
-        <span id="show_more_categories_" class="hidden">{{_("More")}}</span>
-        <span id="show_less_categories_" class="hidden">{{_("Less")}}</span>
-        <div id="more_categories">
-            {% for category in categories %}
-                {% if not (category in main_categories + ["map"] or category in selected_categories) %}
-                    {{ category_widget(category) }}
-                {% endif %}
-            {% endfor %}
+<div class="categories-wrap">
+    <div id="categories" {% if rtl %} class="rtl" {% endif %}>
+        {% for category in categories %}
+            {% if category in main_categories + selected_categories %}
+                {{ category_widget(category) }}
+            {% endif %}
+        {% endfor %}
+    
+        <div id="more_categories_container">
+            <input type="checkbox" name="more_categories_toggle" id="more_categories_toggle" class="hidden">
+            <label for="more_categories_toggle" id="show_more_categories">{{_("More")}}</label>
+            <label for="more_categories_toggle" id="show_less_categories">{{_("Less")}}</label>
+            <span id="show_more_categories_" class="hidden">{{_("More")}}</span>
+            <span id="show_less_categories_" class="hidden">{{_("Less")}}</span>
+            <div id="more_categories">
+                {% for category in categories %}
+                    {% if not (category in main_categories + ["map"] or category in selected_categories) %}
+                        {{ category_widget(category) }}
+                    {% endif %}
+                {% endfor %}
+            </div>
         </div>
+
+        <span id="time_and_lang">
+            {% set flat_lang_selector = True %}
+            {% include 'etheme/components/languages.html' %}
+            {% include 'etheme/components/time-range.html' %}
+        </span>
     </div>
-</div>
+    
+</div>
\ No newline at end of file
diff --git a/searx/templates/etheme/components/search_full.html b/searx/templates/etheme/components/search_full.html
index a9e8df8706d82b9fa30941bd7f792ce61b31699e..aa4e85904c4ecce8ad0be6d4e2a61f58f4ad9658 100644
--- a/searx/templates/etheme/components/search_full.html
+++ b/searx/templates/etheme/components/search_full.html
@@ -3,10 +3,5 @@
 {% call search_bar(q, true, rtl) %}
   <div id="search_params">
     {% include 'etheme/components/categories.html' %}
-    <span id="time_and_lang">
-      {% set flat_lang_selector = True %}
-      {% include 'etheme/components/languages.html' %}
-      {% include 'etheme/components/time-range.html' %}
-    </span>
   </div>
 {% endcall %}