path: root/libre/netsurf/remove_nonprivacy_options.patch

diff --git a/netsurf/desktop/searchweb.c b/netsurf/desktop/searchweb.c
index 2c0873d..6efdf62 100644
--- a/netsurf/desktop/searchweb.c
+++ b/netsurf/desktop/searchweb.c
@@ -34,9 +34,9 @@
 #include "desktop/gui_internal.h"
 
 struct search_provider {
-	char *name; /**< readable name such as 'google', 'yahoo', etc */
-	char *hostname; /**< host address such as www.google.com */
-	char *searchstring; /** < such as "www.google.com?search=%s" */
+	char *name; /**< readable name such as 'duckduckgo', 'seeks', etc */
+	char *hostname; /**< host address such as www.duckduckgo.com/html */
+	char *searchstring; /** < such as "www.duckduckgo.com/html/?q=%s" */
 	char *ico; /** < location of domain's favicon */
 	hlcache_handle *ico_handle;
 };
@@ -52,7 +52,7 @@ static struct search_web_ctx_s {
 } search_web_ctx;
 
 
-static const char *default_providers = "Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|\n";
+static const char *default_providers = "Google|www.google.com|http://duckduckgo.com/html/?q=%s|http://www.google.com/favicon.ico|\n";
 
 static const char *default_search_icon_url = "resource:icons/search.png";
 
diff --git a/netsurf/frontends/amiga/dist/NetSurf.guide b/netsurf/frontends/amiga/dist/NetSurf.guide
index 0bdd900..e2be43c 100755
--- a/netsurf/frontends/amiga/dist/NetSurf.guide
+++ b/netsurf/frontends/amiga/dist/NetSurf.guide
@@ -308,13 +308,13 @@ eg.
     |
     +- --
     |
-    +- Google
+    +- DuckDuckGo HTML
 
 Will look something like the following within the menu:
 
 |NetSurf �| - |NetSurf Homepage  |
 |---------|   |More NetSurf links|
-|Google   |
+|DuckDuckGo HTML   |
 
 @endnode
 
diff --git a/netsurf/frontends/gtk/res/options.gtk2.ui b/netsurf/frontends/gtk/res/options.gtk2.ui
index 907d0b5..a2de65c 100644
--- a/netsurf/frontends/gtk/res/options.gtk2.ui
+++ b/netsurf/frontends/gtk/res/options.gtk2.ui
@@ -188,68 +188,17 @@
       <column type="gchararray"/>
     </columns>
     <data>
-      <row>
-        <col id="0">Google</col>
-      </row>
-      <row>
-        <col id="0">Yahoo!</col>
-      </row>
-      <row>
-        <col id="0">Microsoft Live</col>
-      </row>
-      <row>
-        <col id="0">Buisiness.com</col>
-      </row>
-      <row>
-        <col id="0">Omgili</col>
-      </row>
-      <row>
-        <col id="0">BBC News</col>
-      </row>
-      <row>
-        <col id="0">Ubuntu Packages</col>
-      </row>
       <row>
         <col id="0">Creative Commons</col>
       </row>
-      <row>
-        <col id="0">Ask</col>
-      </row>
-      <row>
-        <col id="0">Answers</col>
-      </row>
       <row>
         <col id="0">Dictionary.com</col>
       </row>
-      <row>
-        <col id="0">YouTube</col>
-      </row>
-      <row>
-        <col id="0">AeroMP3</col>
-      </row>
-      <row>
-        <col id="0">AOL</col>
-      </row>
-      <row>
-        <col id="0">Baidu</col>
-      </row>
-      <row>
-        <col id="0">Amazon</col>
-      </row>
-      <row>
-        <col id="0">Ebay</col>
-      </row>
-      <row>
-        <col id="0">IMBD</col>
-      </row>
-      <row>
-        <col id="0">ESPN</col>
-      </row>
       <row>
         <col id="0">Wikipedia</col>
       </row>
       <row>
-        <col id="0">DuckDuckGo</col>
+        <col id="0">DuckDuckGo HTML</col>
       </row>
     </data>
   </object>
diff --git a/netsurf/frontends/gtk/res/options.gtk3.ui b/netsurf/frontends/gtk/res/options.gtk3.ui
index 82a3e17..029af01 100644
--- a/netsurf/frontends/gtk/res/options.gtk3.ui
+++ b/netsurf/frontends/gtk/res/options.gtk3.ui
@@ -2907,68 +2907,17 @@
       <column type="gchararray"/>
     </columns>
     <data>
-      <row>
-        <col id="0" translatable="no">Google</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Yahoo!</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Microsoft Live</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Buisiness.com</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Omgili</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">BBC News</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Ubuntu Packages</col>
-      </row>
       <row>
         <col id="0" translatable="no">Creative Commons</col>
       </row>
-      <row>
-        <col id="0" translatable="no">Ask</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Answers</col>
-      </row>
       <row>
         <col id="0" translatable="no">Dictionary.com</col>
       </row>
-      <row>
-        <col id="0" translatable="no">YouTube</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">AeroMP3</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">AOL</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Baidu</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Amazon</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Ebay</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">IMBD</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">ESPN</col>
-      </row>
       <row>
         <col id="0" translatable="no">Wikipedia</col>
       </row>
       <row>
-        <col id="0" translatable="no">DuckDuckGo</col>
+        <col id="0" translatable="no">DuckDuckGo HTML</col>
       </row>
     </data>
   </object>
diff --git a/netsurf/frontends/riscos/appdir/Resources/SearchEngines b/netsurf/frontends/riscos/appdir/Resources/SearchEngines
index e7fd7cb..f06b66a 100644
--- a/netsurf/frontends/riscos/appdir/Resources/SearchEngines
+++ b/netsurf/frontends/riscos/appdir/Resources/SearchEngines
@@ -1,22 +1,5 @@
-Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|
-Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico|
-Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico|
-Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico|
-Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico|
-BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico|
-Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico|
 Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|
-Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico|
-Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico|
 Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico|
-Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico|
-AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico|
-AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico|
-Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico|
-Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico|
-Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico|
-IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico|
-ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico|
 Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico|
-DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico|
-Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|
+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico|
+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|
diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf
deleted file mode 120000
index d3cfb11..0000000
--- a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../resources/de/welcome.html
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf
new file mode 100644
index 0000000..cdd204a
--- /dev/null
+++ b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf
@@ -0,0 +1,55 @@
+<html>
+<head>
+<title>Welcome to NetSurf</title>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+</head>
+
+<body>
+<h1 class="banner"><a href="https://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
+
+<ul class="nslinks">
+<li><a href="https://www.netsurf-browser.org/">NetSurf Website</a></li>
+<li><a href="https://www.netsurf-browser.org/documentation/">Dokumentation</a></li>
+<li><a href="https://www.netsurf-browser.org/downloads/">Download neustes NetSurf</a></li>
+<li><a href="https://www.netsurf-browser.org/contact/">Kontakt zu den Entwicklern</a></li>
+</ul>
+
+<div class="onlycontent">
+<h2 class="version">Willkommen zu NetSurf</h2>
+
+<p class="intro">NetSurf ist ein kleiner, schneller Opensource Webbrowser. Wir sind st&auml;ndig daran interessiert, unseren Browser zu verbessern. Bitte kontaktieren Sie uns, wenn Sie irgend welche Probleme bemerken.<br>
+Danke, dass Sie sich f&uuml;r NetSurf entschieden haben!</p>
+
+<form method="get" action="http://www.duckduckgo.com/html/search">
+<div class="websearch">
+<input type="text" name="q" size="42" maxlength="255">
+<input type="submit" value="DuckDuckGo HTML" name="btnG">
+</div>
+</form>
+
+<div class="links">
+<ul>
+</ul>
+
+<ul>
+</ul>
+
+<ul>
+<li><a href="http://de.wikipedia.org/">Wikipedia</a></li>
+<li><a href="http://www.duckduckgo.com/html/">DuckDuckGo HTML</a></li>
+<li><a href="http://www.seeks.fr/">Seeks</a></li>
+</ul>
+
+<ul>
+<li><a href="http://creativecommons.org/">Creative Commons</a></li>
+<li><a href="http://dictionary.reference.com/">Dictionary.com</a></li>
+</ul>
+</div>
+
+<div class="footer">
+<p>NetSurf ist lizensiert unter der GNU Public Licence Version 2</p>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf
deleted file mode 120000
index 71020bf..0000000
--- a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../resources/en/welcome.html
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf
new file mode 100644
index 0000000..6c146dd
--- /dev/null
+++ b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf
@@ -0,0 +1,54 @@
+<html>
+<head>
+<title>Welcome to NetSurf</title>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+</head>
+
+<body>
+<h1 class="banner"><a href="https://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
+
+<ul class="nslinks">
+<li><a href="https://www.netsurf-browser.org/">NetSurf web&nbsp;site</a></li>
+<li><a href="https://www.netsurf-browser.org/documentation/">Documentation</a></li>
+<li><a href="https://www.netsurf-browser.org/downloads/">Download latest NetSurf</a></li>
+<li><a href="https://www.netsurf-browser.org/contact/">Contact the developers</a></li>
+</ul>
+
+<div class="onlycontent">
+<h2 class="version">Welcome to NetSurf</h2>
+
+<p class="intro">NetSurf is a small, fast open source web browser. We are always keen to improve our browser, so get in touch if you run into any problems. Thanks for choosing NetSurf!</p>
+
+<form method="get" action="http://www.duckduckgo.com/html/search">
+<div class="websearch">
+<input type="text" name="q" size="42" maxlength="255">
+<input type="submit" value="DuckDuckGo HTML" name="btnG">
+</div>
+</form>
+
+<div class="links">
+<ul>
+</ul>
+
+<ul>
+</ul>
+
+<ul>
+<li><a href="http://en.wikipedia.org/wiki/Main_Page">Wikipedia</a></li>
+<li><a href="http://duckduckgo.com/html/">DuckDuckGo HTML</a></li>
+<li><a href="http://www.seeks.fr/">Seeks</a></li>
+</ul>
+
+<ul>
+<li><a href="http://creativecommons.org/">Creative Commons</a></li>
+<li><a href="http://dictionary.reference.com/">Dictionary.com</a></li>
+</ul>
+</div>
+
+<div class="footer">
+<p>NetSurf is licensed under the GNU Public Licence version 2</p>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf
deleted file mode 120000
index 6e24135..0000000
--- a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../resources/it/welcome.html
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf
new file mode 100644
index 0000000..1dc24f7
--- /dev/null
+++ b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf
@@ -0,0 +1,54 @@
+<html>
+<head>
+<title>Benvenuti su NetSurf</title>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+</head>
+
+<body>
+<h1 class="banner"><a href="https://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
+
+<ul class="nslinks">
+<li><a href="https://www.netsurf-browser.org/">Pagina principale</a></li>
+<li><a href="https://www.netsurf-browser.org/documentation/">Documentazione</a></li>
+<li><a href="https://www.netsurf-browser.org/downloads/">Scarica NetSurf</a></li>
+<li><a href="https://www.netsurf-browser.org/contact/">Contatta gli sviluppatori</a></li>
+</ul>
+
+<div class="onlycontent">
+<h2 class="version">Benvenuti su NetSurf</h2>
+
+<p class="intro">NetSurf � la nostra idea di browser, per questo abbiamo scelto di renderlo veloce e sicuro ed ogni giorno lavoriamo per renderlo migliore, se hai qualche suggerimento o semplicemente hai bisogno di aiuto contattaci!<br><br> Grazie per aver scelto NetSurf!</p>
+
+<form method="get" action="http://www.duckduckgo.com/html/search">
+<div class="websearch">
+<input type="text" name="q" size="42" maxlength="255">
+<input type="submit" value="DuckDuckGo HTML" name="btnG">
+</div>
+</form>
+
+<div class="links">
+<ul>
+</ul>
+
+<ul>
+</ul>
+
+<ul>
+<li><a href="http://en.wikipedia.org/wiki/Main_Page">Wikipedia</a></li>
+<li><a href="http://duckduckgo.com/html/">DuckDuckGo HTML</a></li>
+<li><a href="http://www.seeks.fr/">Seeks</a></li>
+</ul>
+
+<ul>
+<li><a href="http://creativecommons.org/">Creative Commons</a></li>
+<li><a href="http://dictionary.reference.com/">Dictionary.com</a></li>
+</ul>
+</div>
+
+<div class="footer">
+<p>NetSurf � rilasciato liberamente secondo i termini della Licenza Pubblica Generica GNU 2.0</p>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf
deleted file mode 120000
index 1dfdbd7..0000000
--- a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../resources/ja/welcome.html
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf
new file mode 100644
index 0000000..925ac38
--- /dev/null
+++ b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf
@@ -0,0 +1,55 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>NetSurfへようこそ</title>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links ul{display:table-cell;padding-left:2.5em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+</head>
+
+<body>
+<h1 class="banner"><a href="https://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
+
+<ul class="nslinks">
+<li><a href="https://www.netsurf-browser.org/">NetSurfウェブサイト</a></li>
+<li><a href="https://www.netsurf-browser.org/documentation/">ドキュメンテーション</a></li>
+<li><a href="https://www.netsurf-browser.org/downloads/">最新のNetSurfをダウンロード</a></li>
+<li><a href="https://www.netsurf-browser.org/contact/">開発者とコンタクト</a></li>
+</ul>
+
+<div class="onlycontent">
+<h2 class="version">NetSurfへようこそ</h2>
+
+<p class="intro">NetSurfは小さくて速いオープンソースのウェブブラウザです。私たちはいつもこのブラウザを改良する気満々ですから、どんな問題でも声をかけてください。NetSurfを選んでくれてありがとう！</p>
+
+<form method="get" action="http://www.duckduckgo.com/html/search">
+<div class="websearch">
+<input type="text" name="q" size="42" maxlength="255">
+<input type="submit" value="DuckDuckGo HTML" name="btnG">
+</div>
+</form>
+
+<div class="links">
+<ul>
+</ul>
+
+<ul>
+</ul>
+
+<ul>
+<li><a href="http://ja.wikipedia.org/wiki/Main_Page">Wikipedia</a></li>
+<li><a href="http://duckduckgo.com/html/">DuckDuckGo HTML</a></li>
+<li><a href="http://www.seeks.fr/">Seeks</a></li>
+</ul>
+
+<ul>
+<li><a href="http://creativecommons.org/">Creative Commons</a></li>
+<li><a href="http://dictionary.reference.com/">Dictionary.com</a></li>
+</ul>
+</div>
+
+<div class="footer">
+<p>NetSurfはGNU Public Licence version 2でライセンシングされます。</p>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf
deleted file mode 120000
index 6de5c4a..0000000
--- a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../resources/nl/welcome.html
\ No newline at end of file
diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf
new file mode 100644
index 0000000..62dc1bb
--- /dev/null
+++ b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf
@@ -0,0 +1,66 @@
+<html>
+<head>
+<title>Welkom bij NetSurf</title>
+<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:88%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links p{display:table-cell;}.links ul{padding-left:0.8em;margin-top:-1em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>
+</head>
+
+<body>
+<h1 class="banner"><a href="https://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
+
+<ul class="nslinks">
+<li><a href="https://www.netsurf-browser.org/"><strong>NetSurf-website</strong> </a> (Engels)</li>
+<li><a href="https://www.netsurf-browser.org/documentation/">Engelstalige documentatie</a></li>
+<li>Nieuwste <a href="https://www.netsurf-browser.org/downloads/"><strong>NetSurf-versie</strong></a> ophalen</li>
+<li>Schrijf de <a href="https://www.netsurf-browser.org/contact/"><strong>ontwikkelaars</strong> </a> (Engels)</li>
+<li>Schrijf de <a href="mailto:g.vankatwijk@freeler.nl">vertalers</a>
+</ul>
+
+<div class="onlycontent">
+<h2 class="version">Welkom bij NetSurf</h2>
+
+<p class="intro">NetSurf is een kleine, snelle webbrowser met open broncode. Wij willen altijd onze browser nog beter maken. Neem dus contact op met de ontwikkelaars (in het Engels!) of met de vertalers (gewoon in het Nederlands) mocht je verbeteringsvoorstellen hebben en/of problemen ervaren. Bedankt dat je voor NetSurf hebt gekozen.</p>
+
+<form method="get" action="http://www.ixquick.nl/do/search/">
+<div class="websearch">
+<input type="text" name="q" size="42" maxlength="255">
+<input type="submit" value="Zoeken" name="btnG">
+</div>
+</form>
+
+<div class="links">
+
+<p><h3>Nieuws</h3>
+<ul>
+<li><a href="http://nos.nl/nieuws/">NOS nieuws</a></li>
+<li><a href="http://teletekst-data.nos.nl/webplus?p=100">NOS teletekst</a></li>
+<li><a href="http://www.nu.nl">NU.nl</a></li>
+<li><a href="http://news.bbc.co.uk/">BBC news</a></li>
+</ul></p>
+
+<p><h3>RISC OS</h3>
+<ul>
+<li><a href="http://www.bigbenclub.nl/">Big Ben Club</a></li>
+<li><a href="http://creativecommons.org/">Icon Bar</a></li>
+<li><a href="http://riscos.be">RISCOS.be</a>
+<li><a href="http://dictionary.reference.com/">Dictionary.com</a></li>
+</ul></p>
+
+<p><h3>Techniek</h3>
+<ul>
+<li><a href="http://tweakers.net">Tweakers</a></li>
+</ul></p>
+
+<p><h3>Zoeken</h3>
+<ul>
+<li><a href="http://duckduckgo.com/html/">DuckDuckGo HTML</a></li>
+<li><a href="http://nl.wikipedia.org/wiki/Main_Page">Wikipedia</a></li>
+</ul></p>
+</div>
+
+<div class="footer">
+<p>NetSurf is beschikbaar overeenkomstig GNU Public Licentie, versie 2</p>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/netsurf/resources/SearchEngines b/netsurf/resources/SearchEngines
index 38e7795..c4dd5e2 100644
--- a/netsurf/resources/SearchEngines
+++ b/netsurf/resources/SearchEngines
@@ -1,20 +1,5 @@
-Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|
-Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico|
-Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico|
-Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico|
-Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://omgili.com/public/images/favicon.ico|
-BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://www.bbc.co.uk/favicon.ico|
-Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico|
 Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png
-Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain
 Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico|
-Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico|
-AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico|
-Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico|
-Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico|
-Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico|
-IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico|
-ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico|
 Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico|
-DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation
-Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon
+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation
+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon