diff --git a/app/default-files/default-themes/simple/config.json b/app/default-files/default-themes/simple/config.json
index a9c5c598e..3d347bb6a 100755
--- a/app/default-files/default-themes/simple/config.json
+++ b/app/default-files/default-themes/simple/config.json
@@ -869,22 +869,59 @@
             "value": false,
             "type": "checkbox"
         },
+        {       
+            "name": "searchMode",
+            "label": "Mode",
+            "group": "Search",           
+            "note": "The <strong>external</strong> mode allows you to search from any external search engine.<br/>The <strong>integrated</strong> mode will integrate the search results on your website.", 
+            "value": "external",
+            "type": "radio",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            }],
+            "options": [
+                {
+                    "label": "External",
+                    "value": "external"
+                },
+                {
+                    "label": "Integrated",
+                    "value": "integrated"
+                }                
+            ]
+        },
         {
-            "name": "searchId",
+            "name": "separator",
+            "type": "separator",
+            "label": "Search configuration",
             "group": "Search",
-            "label": "Google Custom Search Id",
-            "note": "A search ID is required for search functionality, which uses Google Custom Search. Learn how to configure it here: <a href='https://getpublii.com/docs/search-configuration.html' target='_blank'>https://www.getpublii.com/docs/...</a>",
-            "value": "",
-            "type": "text",
+            "size": "big",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            }]
+        },
+        {
+            "name": "searchServer",
+            "group": "Search",
+            "label": "Engine",
+            "note": "Enter the URL of the search engine you want to use on your website.",
+            "value": "https://duckduckgo.com",
+            "type": "url",
             "dependencies": [{
                 "field": "search",
                 "value": "true"
+            },
+            {
+                "field": "searchMode",
+                "value": "external"
             }]
         },
         {
             "name": "searchParam",
             "group": "Search",
-            "label": "Search parameter",
+            "label": "Parameter",
             "note": "You can change the default \"q\" search parameter if desired; this is recommended only for advanced users.",
             "value": "q",
             "type": "text",
@@ -893,6 +930,89 @@
                 "value": "true"
             }]
         },
+        {       
+            "name": "searchMethod",
+            "label": "Form Method",
+            "group": "Search",           
+            "note": "Select the method you want to use for your search engine.", 
+            "value": "get",
+            "type": "radio",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            },
+            {
+                "field": "searchMode",
+                "value": "external"
+            }],
+            "options": [
+                {
+                    "label": "Post",
+                    "value": "post"
+                },
+                {
+                    "label": "Get",
+                    "value": "get"
+                }                
+            ]
+        },
+        {
+            "name": "searchTab",
+            "label": "Open results in new tab",
+            "group": "Search",
+            "value": false,
+            "type": "checkbox",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            }]
+        },
+        {
+            "name": "searchForceWebsiteResults",
+            "label": "Only show results from your website",
+            "group": "Search",
+            "value": true,
+            "type": "checkbox",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            },
+            {
+                "field": "searchMode",
+                "value": "external"
+            }]
+        },
+        {
+            "name": "separator",
+            "type": "separator",
+            "label": "Google search configuration",
+            "group": "Search",
+            "size": "big",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            },
+            {
+                "field": "searchMode",
+                "value": "integrated"
+            }]
+        },
+        {
+            "name": "searchId",
+            "group": "Search",
+            "label": "Custom Search Id",
+            "note": "A search ID is required for integrated mode functionality, which uses Google Custom Search. Learn how to configure it here: <a href='https://getpublii.com/docs/search-configuration.html' target='_blank'>https://www.getpublii.com/docs/...</a>",
+            "value": "",
+            "type": "text",
+            "dependencies": [{
+                "field": "search",
+                "value": "true"
+            },
+            {
+                "field": "searchMode",
+                "value": "integrated"
+            }]
+        },
 
         {
             "name": "shareFacebook",
diff --git a/app/default-files/default-themes/simple/partials/top.hbs b/app/default-files/default-themes/simple/partials/top.hbs
index 6d492c3ee..8bf980b9d 100755
--- a/app/default-files/default-themes/simple/partials/top.hbs
+++ b/app/default-files/default-themes/simple/partials/top.hbs
@@ -14,15 +14,42 @@
          <div class="search">
             <div class="search__overlay js-search-overlay">
                <div class="search__overlay-inner">
-                  <form action="{{@website.searchUrl}}" class="search__form">
-                     <input
-                        class="search__input js-search-input"
-                        type="search"
-                        name="{{@config.custom.searchParam}}"
-                        placeholder="{{ translate 'search.placeholder' }}" 
-                        aria-label="{{ translate 'search.placeholder' }}"
-                        autofocus="autofocus"/>
-                  </form>
+                  {{#checkIf @config.custom.searchMode '===' "external"}}
+                        <form action="{{@config.custom.searchServer}}" class="search__form" method="{{@config.custom.searchMethod}}" {{#if @config.custom.searchTab}}target="_blank"{{/if}} {{#if @config.custom.searchForceWebsiteResults}}onsubmit="configInputSubmit();"{{/if}}>
+                            {{#if @config.custom.searchForceWebsiteResults}}
+                                <input
+                                    id="search_input"
+                                    class="search__input js-search-input"
+                                    type="search"
+                                    placeholder="{{ translate 'search.placeholder' }}" 
+                                    aria-label="{{ translate 'search.placeholder' }}"
+                                    autofocus="autofocus"/>
+                                <input
+                                    id="search_go"
+                                    type="hidden"
+                                    name="{{@config.custom.searchParam}}"/>
+                            {{else}}
+                                <input
+                                    class="search__input js-search-input"
+                                    type="search"
+                                    name="{{@config.custom.searchParam}}"
+                                    placeholder="{{ translate 'search.placeholder' }}" 
+                                    aria-label="{{ translate 'search.placeholder' }}"
+                                    autofocus="autofocus"/>
+                            {{/if}}
+                      </form>
+                        {{#if @config.custom.searchForceWebsiteResults}}<script>function configInputSubmit(){document.getElementById('search_go').value='site:'+window.location.hostname+' '+document.getElementById('search_input').value;return true;}</script>{{/if}}
+                    {{else}}
+                        <form action="{{@website.searchUrl}}" class="search__form" {{#if @config.custom.searchTab}}target="_blank"{{/if}}>
+                             <input
+                                class="search__input js-search-input"
+                                type="search"
+                                name="{{@config.custom.searchParam}}"
+                                placeholder="{{ translate 'search.placeholder' }}" 
+                                aria-label="{{ translate 'search.placeholder' }}"
+                                autofocus="autofocus"/>
+                        </form>
+                    {{/checkIf}}
                   <button class="search__close js-search-close" aria-label="{{ translate 'search.close' }}">
                      {{ translate 'search.close' }}
                   </button>