From e595830fab0316f9121f1dba6e56dc6542718e114b2c8a1c8cd10d49abfe8078 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Sat, 12 Apr 2025 00:42:01 -0400
Subject: [PATCH] Rename user-facing bits of Dillo to Flenser.

I dunno if I got them all.

This is also now version 0.0.0
---
 ChangeLog                                     |   3 +
 Makefile.am                                   |   8 +-
 configure.ac                                  |   4 +-
 doc/user_help.in.html                         | 140 +++++++++---------
 dpi/bookmarks.c                               |  18 +--
 dpi/cookies.c                                 |   8 +-
 dpi/downloads.cc                              |   2 +-
 dpid/dpi.c                                    |   4 +-
 dpid/dpi_socket_dir.c                         |   4 +-
 dpid/dpid.c                                   |   8 +-
 dpid/dpid.h                                   |   2 +-
 dpid/dpid_common.h                            |   6 +-
 dpid/dpidc.c                                  |   4 +-
 dpip/dpip.c                                   |   2 +-
 ...hyphenation => flenser-install-hyphenation |   4 +-
 dillo.desktop => flenser.desktop              |   2 +-
 dillorc => flenserrc                          |  28 ++--
 install-dpi-local                             |   2 +-
 src/IO/about.c                                |   2 +-
 src/IO/dpi.cc                                 |   4 +-
 src/IO/tls_mbedtls.c                          |   2 +-
 src/IO/tls_openssl.cc                         |  10 +-
 src/Makefile.am                               |  12 +-
 src/cookies.cc                                |   2 +-
 src/domainrc                                  |   4 +-
 src/{dillo.cc => flenser.cc}                  |  10 +-
 src/paths.cc                                  |   4 +-
 src/paths.hh                                  |   2 +-
 src/styleengine.cc                            |   2 +-
 src/uicmd.cc                                  |   4 +-
 src/version.cc                                |   3 +-
 test/unit/cookies.c                           |   6 +-
 32 files changed, 161 insertions(+), 155 deletions(-)
 rename dillo-install-hyphenation => flenser-install-hyphenation (97%)
 rename dillo.desktop => flenser.desktop (94%)
 rename dillorc => flenserrc (95%)
 rename src/{dillo.cc => flenser.cc} (98%)

diff --git a/ChangeLog b/ChangeLog
index 362d9b5..ed6919c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 Flenser project
 =============================================================================
 
+flenser-0.0.0 [Feb 28, 2025]
+
 flenser-3.2.0 [Feb 28, 2025]
 
 +- Forked from dillo.
@@ -10,6 +12,7 @@ flenser-3.2.0 [Feb 28, 2025]
  - The coding style and related guides are hereby "abolished".
  - The general architecture of modules and such will remain unchanged for now.
  - I'll start by moving to smart pointers and RAII anywhere I can.
+ - Not really version 3.2.0.  I'll roll the version back to 0.
 
 =============================================================================
 Dillo project
diff --git a/Makefile.am b/Makefile.am
index ced4a8c..b18864c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 SUBDIRS = lout dw dlib dpip src doc dpid dpi test
 
-dist_bin_SCRIPTS = dillo-install-hyphenation
+dist_bin_SCRIPTS = flenser-install-hyphenation
 
-EXTRA_DIST = README.md Doxyfile dillorc install-dpi-local d_size.h
+EXTRA_DIST = README.md Doxyfile flenserrc install-dpi-local d_size.h
 
-sysconf_DATA = dillorc
+sysconf_DATA = flenserrc
 
 desktopdir = $(datadir)/applications
-desktop_DATA = dillo.desktop
+desktop_DATA = flenser.desktop
 
 appicon48dir = $(datadir)/icons/hicolor/48x48/apps/
 appicon48_DATA = icons/48x48/dillo.png
diff --git a/configure.ac b/configure.ac
index 3b6bf18..f359704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with aclocal, autoconf and automake.
 
-AC_INIT([dillo], [3.2.0])
+AC_INIT([flenser], [0.0.0])
 
 dnl Detect the canonical target build environment
 AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([src/dillo.cc])
+AC_CONFIG_SRCDIR([src/flenser.cc])
 AC_CONFIG_HEADERS([config.h])
 
 sysconfdir=${sysconfdir}/${PACKAGE}
diff --git a/doc/user_help.in.html b/doc/user_help.in.html
index e5715e0..4eaa006 100644
--- a/doc/user_help.in.html
+++ b/doc/user_help.in.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Dillo User Manual</title>
+  <title>Flenser User Manual</title>
     <style>
 body {
   background: white;
@@ -74,13 +74,13 @@ footer {
 
 <body>
 <div class="main">
-<h1>Dillo User Manual</h1>
+<h1>Flenser User Manual</h1>
 
-<p>Welcome to the user manual of the Dillo browser. The manual is divided into
+<p>Welcome to the user manual of the Flenser browser. The manual is divided into
 <em>sections</em> but is written in a <em>single page</em> to allow search by
 keywords. Generated for version __VERSION__.</p>
 
-<details><!-- Not supported in Dillo, but decays ok -->
+<details><!-- Not supported in Flenser, but decays ok -->
 <summary class="toc">Table of contents:</summary>
 <ul class="toc">
   <li><a href="#introduction">Introduction</a></li>
@@ -114,7 +114,7 @@ keywords. Generated for version __VERSION__.</p>
     </ul>
   <li><a href="#configuration">Configuration</a>
     <ul>
-      <li><a href="#dillorc">Dillorc</a></li>
+      <li><a href="#flenserrc">Flenserrc</a></li>
       <li><a href="#cookiesrc">Cookiesrc</a></li>
       <li><a href="#domainrc">Domainrc</a></li>
       <li><a href="#style-css">Style.css</a></li>
@@ -134,13 +134,13 @@ keywords. Generated for version __VERSION__.</p>
 </details> 
 
 <h2 id="introduction">Introduction</h2>
-<p>Dillo is a web browser designed to be fast, use few resources and support
+<p>Flenser is a web browser designed to be fast, use few resources and support
 slow and unreliable networks on resource-constrained machines. It can load local
 and remote files via HTTP, HTTPS and FTP. Other protocols like Gemini, Gopher,
 IPFS and others are available as 
 <a href="#plugins">plugins</a>.</p>
 
-<p>Dillo supports a subset of HTML 4.01 and CSS 2.1 but it <b>doesn't support
+<p>Flenser supports a subset of HTML 4.01 and CSS 2.1 but it <b>doesn't support
 JavaScript</b> and only implements some elements of HTML 5 and CSS 3. It also
 renders plain text documents and images in PNG, JPG, GIF, SVG and WebP
 formats.</p>
@@ -155,18 +155,18 @@ device. At the top of the browser window you have the location bar and the main
 buttons to control the browser. You can leave the mouse for a brief moment over
 any part of the menu to show a tooltip with more information.
 <p>
-Dillo has <em>context sensitive menus</em>, which are opened with the right mouse
+Flenser has <em>context sensitive menus</em>, which are opened with the right mouse
 button, available on pages, links, images, forms, the Back and Forward buttons,
 and the bug meter. They show different actions to be performed specific to the
 element. For example, to save a page you can right-click on the page and select
 "Save page as...". Or to copy a link URL you can right-click on a link and
 select "Copy link location".
 <p>
-Dillo can hide all panels and use the whole window area to display the page. To
+Flenser can hide all panels and use the whole window area to display the page. To
 switch between modes use the ESC key. You can also choose the control panel size
 by going to the Tools button and selecting a different one under "Panel size".
 <p>
-You can open this manual from Dillo by clicking on the top right "?" button. It
+You can open this manual from Flenser by clicking on the top right "?" button. It
 doesn't require a network connection.
 
 <h3 id="scrolling">Scrolling</h3>
@@ -211,7 +211,7 @@ doesn't require a network connection.
 </ul>
 
 <p>You can control the <b>size of a <em>step</em></b> by setting the
-<code>scroll_step</code> option in the <a href="#dillorc">dillorc</a>
+<code>scroll_step</code> option in the <a href="#flenserrc">flenserrc</a>
 configuration file. By default it will scroll 100 pixels per step. The vertical
 scrollbar can be positioned on the left side setting the
 <code>scrollbar_on_left</code> option to <code>YES</code>, by default it is on
@@ -232,7 +232,7 @@ To find text in a document right-click to open the <em>Page menu</em> and select
 <em>Find text</em> or press <code>Ctrl+F</code> on the keyboard. Then type the
 substring that you want to find and click Next (or the <code>Enter</code> key).
 </p>
-Dillo will scroll the page and highlight found text starting from the top. To
+Flenser will scroll the page and highlight found text starting from the top. To
 find a word (not a substring) use spaces around it to limit the search to
 matching words only. 
 <p>
@@ -248,7 +248,7 @@ button.
 If you want to select more than one screen, hold the mouse left button down and
 scroll with PgUp, PgDn or the arrow keys.
 <P>
-If you want to paste an URL into Dillo, do it on the "clear-URL"
+If you want to paste an URL into Flenser, do it on the "clear-URL"
 button (the "X" next to the <a href="#location-bar">location bar</a>).
 <p>
 
@@ -259,7 +259,7 @@ zoom factor. Use <code>Ctrl +</code> to increase the size, <code>Ctrl -</code>
 to decrease it and <code>Ctrl 0</code> to reset the value to 100%.
 <p>
 The initial zoom factor is specified by the <code>zoom_factor</code> option in
-the <a href="#dillorc">dillorc</a> configuration file. When a new tab or window
+the <a href="#flenserrc">flenserrc</a> configuration file. When a new tab or window
 is opened, the current zoom factor value is inherited.
 
 <h2 id="navigation">Navigation</h2>
@@ -327,7 +327,7 @@ You can also select the location bar content from the keyboard by pressing
 <p>
 Several search engines are available by pressing the magnifying glass icon next
 to the location bar or by pressing <code>Ctrl+S</code>. The search engines are
-configured in <a href="#dillorc">Dillorc</a> with the option
+configured in <a href="#flenserrc">Flenserrc</a> with the option
 <code>search_url</code>. Use it multiple times to define multiple search
 engines.
 <p>
@@ -338,19 +338,19 @@ search_url="dd DuckDuckGo http://duckduckgo.com/lite/?kp=-1&amp;kd=-1&amp;q=%s"
 </pre>
 <p>
 Defines the "DuckDuckGo" search engine with the prefix "<code>dd</code>", so you
-can type in the location bar "<code>dd dillo browser</code>" to search with
-DuckDuckGo for the keywords "dillo browser".
+can type in the location bar "<code>dd flenser browser</code>" to search with
+DuckDuckGo for the keywords "flenser browser".
 
 <h3 id="tabs">Tabs</h3>
 <p>
-Dillo can open different web pages into tabs. To open a link in a new tab click
+Flenser can open different web pages into tabs. To open a link in a new tab click
 the middle button instead of the left button. The same applies to buttons to
 submit a form. A new tab can also be opened from the <code>File</code> menu or
 using the shortcut <code>Ctrl+T</code>.
 <p>
 Press <code>Shift</code> while middle-clicking a link to automatically focus the
 new tab. If you want this behaviour to be the default, set the following option
-in the <a href="#dillorc">dillorc</a> configuration file:
+in the <a href="#flenserrc">flenserrc</a> configuration file:
 <pre>
 focus_new_tab=YES
 </pre>
@@ -372,21 +372,21 @@ right_click_closes_tab=NO
 <p>
 Use the <code>new_tab_page</code> option to control which page is loaded in a
 newly opened tab, by default is an empty page. To open the
-bookmarks page set the following line in <a href="#dillorc">dillorc</a>:
+bookmarks page set the following line in <a href="#flenserrc">flenserrc</a>:
 <pre>
 new_tab_page="dpi:/bm/"
 </pre>
 
 <h3 id="bookmarks">Bookmarks</h3>
 <p>
-Dillo can save URLs of web pages as bookmarks so you can open them later. To
+Flenser can save URLs of web pages as bookmarks so you can open them later. To
 bookmark the current page, open the <em>Page menu</em> by right-clicking on the
 page and select "Bookmark this page" (it also works over a link).
 <p>
 To see or edit the bookmarks, click on the Bookmarks button on the panel or
 press <code>Ctrl+B</code>.
 <p>
-Bookmarks are handled by a built-in Dillo plugin named <code>bm</code> (read more
+Bookmarks are handled by a built-in Flenser plugin named <code>bm</code> (read more
 about plugins in the <a href="#plugins">Plugins section</a>) and are
 synchronized across all instances of the browser. The list of bookmarks can also
 be shown by opening the URL <a href="dpi:/bm/"><code>dpi:/bm/</code></a>.
@@ -397,24 +397,24 @@ can edit the file directly to change the bookmarks.
 
 <h2 id="privacy-and-network">Privacy and network</h2>
 
-<p>The default privacy policy in Dillo attempts to keep the user safe from
+<p>The default privacy policy in Flenser attempts to keep the user safe from
 tracking, <em>even if this policy breaks a lot of website functionality</em>. In
 this section you can add exceptions or relax the configuration at your own risk.
 
 <h3 id="https">HTTPS</h3>
 
-<p>Dillo has support for
+<p>Flenser has support for
 <a href="https://en.wikipedia.org/wiki/HTTPS">HTTPS</a>,
 allowing secure connections to remote websites. Use the protocol
 "<code>https:</code>" to specify the use of HTTPS. When a problem is encountered
 with the remote certificate, a warning dialog explains the details and allows
 you to choose what to do: continue loading the website or cancel.
 <p>
-By default Dillo looks for a TLS library at build time, which can be OpenSSL or
+By default Flenser looks for a TLS library at build time, which can be OpenSSL or
 mbedTLS. You can see which library is being used by looking at the console when
 it starts:
 <pre>
-$ dillo
+$ flenser
 dillo_dns_init: Here we go! (threaded)
 TLS library: <u>OpenSSL 3.2.1 30 Jan 2024</u>
 ...
@@ -426,7 +426,7 @@ Due to privacy concerns, <b>cookies are disabled by default</b> unless
 explicitly enabled in the configuration.
 <p>
 Support for cookies is implemented using a built-in plugin that shares them
-between several instances of Dillo and follows the 
+between several instances of Flenser and follows the 
 <a href="http://tools.ietf.org/html/rfc6265">RFC 6265</a>
 specification. Current cookie limits are 20 per domain and
 1200 in total.
@@ -436,17 +436,17 @@ the <a href="#cookiesrc">Cookiesrc section</a> to see how to enable cookies for
 some domains or accept them by default.</p>
 
 <h3 id="proxy">Proxy</h3>
-<p>Dillo can use a HTTP proxy by setting the environment variable
+<p>Flenser can use a HTTP proxy by setting the environment variable
 <code>http_proxy</code> or the
-<a href="#dillorc">configuration option</a> with the same name. All HTTP and
+<a href="#flenserrc">configuration option</a> with the same name. All HTTP and
 HTTPS traffic will be sent through the proxy.
 
 <p><b>Note</b>: Plugins may not implement proxy support.
 </p>
 
 <h3 id="ad-blocking">Ad blocking</h3>
-<p>Dillo has the ability to block content when loading a page based on the domain
-the embedded content is being loaded from. You can control how Dillo handles
+<p>Flenser has the ability to block content when loading a page based on the domain
+the embedded content is being loaded from. You can control how Flenser handles
 automatic requests for resources (like images and style sheets) that aren't at
 the same domain as the original page.</p>
 
@@ -468,30 +468,30 @@ You can browse without images now:
 An image's alt text (or <code>[IMG]</code> placeholder) will appear in the
 page.
 <li>If you want to load an individual image, left click on its text.
-<li>You can set "no images" as the default mode in dillorc.
+<li>You can set "no images" as the default mode in flenserrc.
 </ul>
 
 <h2 id="configuration">Configuration</h2>
 
-<p>Dillo has <b>several configuration files</b> that control the behavior of the
+<p>Flenser has <b>several configuration files</b> that control the behavior of the
 browser. Each configuration file is searched <em>first</em> in the
-<a href="file:~/.dillo"><code>~/.dillo</code></a> directory and,
+<a href="file:~/.flenser"><code>~/.flenser</code></a> directory and,
 <em>if not found</em>, in the default system configuration directory (typically
-<code>/etc/dillo</code>).</p>
+<code>/etc/flenser</code>).</p>
 
 <p>Most configuration files can include comments by <em>starting</em> a line
 with the "<code>#</code>" symbol. Their specific syntax is described in the
 following sections.</p>
 
-<h3 id="dillorc">Dillorc</h3>
+<h3 id="flenserrc">Flenserrc</h3>
 
-<p>The main configuration of Dillo is controlled by the
-<a href="file:~/.dillo/dillorc"><code>dillorc</code></a> file.
+<p>The main configuration of Flenser is controlled by the
+<a href="file:~/.flenser/flenserrc"><code>flenserrc</code></a> file.
 The list of all available options can be found in the system
 configuration file, typically 
-<a href="file:/etc/dillo/dillorc"><code>/etc/dillo/dillorc</code></a>. You may
+<a href="file:/etc/flenser/flenserrc"><code>/etc/flenser/flenserrc</code></a>. You may
 want to copy it into
-<a href="file:~/.dillo/dillorc"><code>~/.dillo/dillorc</code></a>
+<a href="file:~/.flenser/flenserrc"><code>~/.flenser/flenserrc</code></a>
 and edit it to suit your needs.</p>
 
 The file is commented to describe what each option does. The default value for
@@ -511,7 +511,7 @@ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&amp;go=Go"
 <h3 id="cookiesrc">Cookiesrc</h3>
 
 <p>Cookies are configured in the
-<a href="file:~/.dillo/cookiesrc"><code>~/.dillo/cookiesrc</code></a>
+<a href="file:~/.flenser/cookiesrc"><code>~/.flenser/cookiesrc</code></a>
 file by using rules, with one rule per line. The rule syntax is very simple,
 first specify the <em>host</em> and then the <em>action</em>, separated by
 white spaces. Comment lines start with <code>#</code> as the first character and
@@ -529,7 +529,7 @@ allow sites to track you over time).
 <p>
 When the cookies plugin exits, only the accepted cookies by <code>ACCEPT</code>
 are saved to
-<a href="file:~/.dillo/cookies.txt"><code>~/.dillo/cookies.txt</code></a>,
+<a href="file:~/.flenser/cookies.txt"><code>~/.flenser/cookies.txt</code></a>,
 and ACCEPT_SESSION cookies are
 forgotten. The cookies plugin normally exits after a period of inactivity, but
 you can force it to exit with the command <code>dpidc stop</code>.
@@ -552,21 +552,21 @@ fltk.org      ACCEPT
     save them when the cookie plugin exits.</li>
 </ul>
 <p>
-Dillo is especially concerned about privacy and security issues. Our advice is
+Flenser is especially concerned about privacy and security issues. Our advice is
 to <em>avoid cookies whenever possible</em> and at most set ACCEPT_SESSION to
 <em>specific trusted sites</em>.
 
 <h3 id="domainrc">Domainrc</h3>
 
 <p>With the
-<code>~/.dillo/domainrc</code>
-file, you can control how Dillo handles automatic requests for resources
+<code>~/.flenser/domainrc</code>
+file, you can control how Flenser handles automatic requests for resources
 (like images and style sheets) that aren't at the same domain as the
 original page.
 <p>
 The file contains one rule per line. Comments are specified by starting the line
 with the <code>#</code> symbol. The default rule is either
-<code>default accept</code> or <code>default deny</code> and will cause Dillo
+<code>default accept</code> or <code>default deny</code> and will cause Flenser
 to, respectively, accept all requests by default or deny all requests by
 default.
 <p>
@@ -598,22 +598,22 @@ default accept
 
 <p>Custom
 <a href="https://en.wikipedia.org/wiki/CSS">CSS styles</a> can be placed in the 
-<a href="file:~/.dillo/style.css"><code>~/.dillo/style.css</code></a>
+<a href="file:~/.flenser/style.css"><code>~/.flenser/style.css</code></a>
 file to set default web page styles. To override page styles add the
 "<code>!important</code>" flag.
 
 <h3 id="dpidrc">Dpidrc</h3>
 
 <p>The configuration for <a href="#plugins">plugins</a> is placed in the 
-<a href="file:~/.dillo/dpidrc"><code>~/.dillo/dpidrc</code></a> file.</p>
+<a href="file:~/.flenser/dpidrc"><code>~/.flenser/dpidrc</code></a> file.</p>
 
-<p>Plugins are searched in the <code>~/.dillo/dpi/</code> directory first, and
+<p>Plugins are searched in the <code>~/.flenser/dpi/</code> directory first, and
 then in the system directory if not found. The <code>dpi_dir</code> option
 sets the system <code>dpi</code> directory and must be specified once. Here is
 an example:</p>
 
 <pre>
-dpi_dir=/usr/lib/dillo/dpi
+dpi_dir=/usr/lib/flenser/dpi
 </pre>
 
 <p>By default, plugins will receive requests at the URL
@@ -645,7 +645,7 @@ image inline in a HTML document.
 
 <p>Web page URLs can be saved as bookmarks so they can be accessed in the future.
 Bookmarks are stored in a plain text file located at
-<a href="file:~/.dillo/bm.txt"><code>~/.dillo/bm.txt</code></a>. The file can be
+<a href="file:~/.flenser/bm.txt"><code>~/.flenser/bm.txt</code></a>. The file can be
 modified by using the
 <a href="dpi:/bm/">Book button</a>
 in the toolbar and the context menu on a page or link, but they can also be
@@ -674,11 +674,11 @@ tool.
 
 <h3 id="keysrc">Keysrc</h3>
 
-<p>The mapping of keys in Dillo is controlled by the
-<a href="file:~/.dillo/keysrc"><code>~/.dillo/keysrc</code></a> file.
+<p>The mapping of keys in Flenser is controlled by the
+<a href="file:~/.flenser/keysrc"><code>~/.flenser/keysrc</code></a> file.
 The format is "<code>key = action</code>" or
 "<code>&lt;modifier&gt;key = action</code>". Lines that begin with a "#" are comments.
-The commented-out bindings below show the defaults built into Dillo.
+The commented-out bindings below show the defaults built into Flenser.
 
 <ul>
 <li>Modifiers recognized: Shift, Ctrl, Alt, Meta (on Mac OS X use "Meta" for
@@ -693,7 +693,7 @@ MediaPlay, MediaPrev, MediaStop, Refresh, Search, Sleep, Stop, VolumeDown,
 VolumeMute, VolumeUp.
 </ul>
 
-<p>If Dillo is running under X11, keys whose names are not recognized can be
+<p>If Flenser is running under X11, keys whose names are not recognized can be
 specified using their keysym value in hexadecimal. Use <code>xev</code> to get
 the keysym, for example:
 <pre>
@@ -720,10 +720,10 @@ l = right
 <h2 id="advanced-usage">Advanced usage</h2>
 
 These sections focus on advanced topics and are recommended for experienced
-users of Dillo.
+users of Flenser.
 
 <h3 id="plugins">Plugins</h3>
-<p>The functionality of Dillo can be extended by using plugins, which can
+<p>The functionality of Flenser can be extended by using plugins, which can
 translate other formats to HTML, implement new protocols or provide a custom
 service.</p>
 
@@ -731,12 +731,12 @@ service.</p>
 interact with the browser using the 
 <a href="https://dillo-browser.github.io/old/dpi1.html">DPI protocol</a>. A
 <a href="https://dillo-browser.github.io/#plugins">list of plugins</a>
-is available on the Dillo website. Some plugins are just a 
+is available on the Flenser website. Some plugins are just a 
 <a href="https://raw.githubusercontent.com/dillo-browser/dillo-plugin-man/master/man.filter.dpi">few 
 lines of shell script</a>, so you are encouraged to read them to learn how to
 write your own plugins. Plugins are searched by looking for files that end with
 the <code>.dpi</code> extension (or <code>.dpi.exe</code> in Windows) in
-<code>~/.dillo/dpi</code> and <code>dpi_dir</code> (see the
+<code>~/.flenser/dpi</code> and <code>dpi_dir</code> (see the
 <a href="#dpidrc">Dpidrc</a> configuration section).</p>
 
 <p>There are two types of plugins: <em>filters</em> and <em>servers</em>.
@@ -751,10 +751,10 @@ share information among requests.</p>
 
 <p>You can install plugins from any third party, but you should always
 review the source before running code written by others. To install a new
-plugin, copy the files to <code>~/.dillo/dpi/<em>name</em>/</code> and
+plugin, copy the files to <code>~/.flenser/dpi/<em>name</em>/</code> and
 then associate the <em>name</em> protocol to the program that must run in
 the
-<a href="file:~/.dillo/dpidrc"><code>~/.dillo/dpidrc</code></a> file.
+<a href="file:~/.flenser/dpidrc"><code>~/.flenser/dpidrc</code></a> file.
 Plugins may have other software dependencies required for it to work.</p>
 
 <p>Here is an example of how to manually install the
@@ -762,20 +762,20 @@ Plugins may have other software dependencies required for it to work.</p>
 (it comes with a Makefile that automates the process, so this is not necessary),
 which is a filter plugin written in shell script:</p>
 <pre>
-$ mkdir -p ~/.dillo/dpi/gemini
-$ cp gemini.filter.dpi ~/.dillo/dpi/gemini/
-$ chmod +x ~/.dillo/dpi/gemini/gemini.filter.dpi
-$ echo "proto.gemini=gemini/gemini.filter.dpi" >> ~/.dillo/dpidrc
+$ mkdir -p ~/.flenser/dpi/gemini
+$ cp gemini.filter.dpi ~/.flenser/dpi/gemini/
+$ chmod +x ~/.flenser/dpi/gemini/gemini.filter.dpi
+$ echo "proto.gemini=gemini/gemini.filter.dpi" >> ~/.flenser/dpidrc
 $ dpidc stop
 </pre>
 <p>Now, when a request is made to an URL that begins with the
 <code>gemini:</code> protocol, it will be processed by the
 <code>gemini/gemini.filter.dpi</code> program, and the output will be displayed
-by Dillo.</p>
+by Flenser.</p>
 
 <h3 id="bug-meter">Bug Meter</h3>
 <p>
-Dillo includes a
+Flenser includes a
 <a 	href='https://dillo-browser.github.io/old/help/bug_meter.html'>bug meter</a>
 which shows the number of detected bugs inside the page. The bugs are caught at
 parsing time, so the error messages also show the line where they occur and
@@ -785,14 +785,14 @@ The primary purpose of the bug meter is to help webmasters and page authors to
 polish the contents of their sites with a view to making them
 compliant with HTML standards.
 <p>
-The bug meter is located at the lower right corner of Dillo. Use the left-click
+The bug meter is located at the lower right corner of Flenser. Use the left-click
 to see the messages, right-click for a menu to open other HTML validators.
 
 <h3 id="keyboard-shortcuts">Keyboard shortcuts</h3>
 <p>
 Most actions can be issued by using a keyboard shortcut. The key bindings can be
 changed in the
-<code><a href="file:~/.dillo/keysrc">~/.dillo/keysrc</a></code> file (see the
+<code><a href="file:~/.flenser/keysrc">~/.flenser/keysrc</a></code> file (see the
 <a href="#keysrc">keysrc</a> section).
 The list of default bindings is given in the following table.
 <p>
@@ -808,7 +808,7 @@ The list of default bindings is given in the following table.
 <tr><td>Ctrl-O                     <td>Open            <td>Open file
 <tr><td>Ctrl-U                     <td>                <td>View source
 <tr><td>Ctrl-B                     <td>Bookmarks       <td>View bookmarks
-<tr><td>Ctrl-Q                     <td>Quit            <td>Quit dillo
+<tr><td>Ctrl-Q                     <td>Quit            <td>Quit flenser
 <tr><td>Ctrl-+ or Ctrl-=           <td>Bigger          <td>Zoom in
 <tr><td>Ctrl--                     <td>Smaller         <td>Zoom out
 <tr><td>Ctrl-0                     <td>100%            <td>Reset zoom to 100%
diff --git a/dpi/bookmarks.c b/dpi/bookmarks.c
index 9bc341b..050c9ea 100644
--- a/dpi/bookmarks.c
+++ b/dpi/bookmarks.c
@@ -109,7 +109,7 @@ DOCTYPE
 "<title>Bookmarks</title>\n"
 CSS_STYLE
 "</head>\n"
-"<body id='dillo_bm'>\n"
+"<body id='flenser_bm'>\n"
 "\n"
 "  <h1>Bookmarks</h1>\n"
 "  <div style='float: right; padding: 1em'>\n"
@@ -123,7 +123,7 @@ DOCTYPE
 "<title>Bookmarks</title>\n"
 CSS_STYLE
 "</head>\n"
-"<body id='dillo_bm'>\n"
+"<body id='flenser_bm'>\n"
 "  <h1>Bookmarks</h1>\n"
 "\n"
 "<form action='modify'>\n"
@@ -143,7 +143,7 @@ CSS_STYLE
 "  , mark its operands and\n"
 "  <input type='submit' name='submit' value='Submit'>\n"
 "  <p>You can also modify the bookmarks by editing the\n"
-"  <a href='file:~/.dillo/bm.txt'><code>~/.dillo/bm.txt</code></a> file.\n"
+"  <a href='file:~/.flenser/bm.txt'><code>~/.flenser/bm.txt</code></a> file.\n"
 "</div>\n";
 
 static const char *mainpage_sections_header =
@@ -212,7 +212,7 @@ DOCTYPE
 "<title>Bookmarks</title>\n"
 CSS_STYLE
 "</head>\n"
-"<body id='dillo_bm'>\n"
+"<body id='flenser_bm'>\n"
 "<h1>Boorkmarks: New section</h1>\n"
 "<form action='modify'>\n"
 "  <input type='hidden' name='operation' value='add_section'>\n"
@@ -235,7 +235,7 @@ DOCTYPE
 "<title>Bookmarks</title>\n"
 CSS_STYLE
 "</head>\n"
-"<body id='dillo_bm'>\n"
+"<body id='flenser_bm'>\n"
 "<h1>Bookmarks: Update</h1>\n"
 "<form action='modify'>\n"
 "<input type='hidden' name='operation' value='modify2'>\n";
@@ -274,7 +274,7 @@ DOCTYPE
 "<title>Bookmarks</title>\n"
 CSS_STYLE
 "</head>\n"
-"<body id='dillo_bm'>\n"
+"<body id='flenser_bm'>\n"
 "<h1>Bookmarks: Add URL</h1>\n"
 "<form action='modify'>\n"
 "<input type='hidden' name='operation' value='add_url2'>\n"
@@ -583,7 +583,7 @@ static void Bms_check_import(void)
 
 
    if (access(BmFile, F_OK) != 0) {
-      OldBmFile = dStrconcat(dGethomedir(), "/.dillo/bookmarks.html", NULL);
+      OldBmFile = dStrconcat(dGethomedir(), "/.flenser/bookmarks.html", NULL);
       if (access(OldBmFile, F_OK) == 0) {
          dStr_sprintf(dstr, cmd1, BmFile);
          rc = system(dstr->str);
@@ -1576,7 +1576,7 @@ static int Bmsrv_parse_token(Dsh *sh, char *Buf)
       if (st != 0) {
          char *err =
             DOCTYPE
-            "<HTML><body id='dillo_bm'> Error on the bookmarks server..."
+            "<HTML><body id='flenser_bm'> Error on the bookmarks server..."
             "      </body></html>";
          if (a_Dpip_dsh_write_str(sh, 1, err) != 0) {
             return 1;
@@ -1634,7 +1634,7 @@ int main(void) {
    /* Initialize local data */
    B_bms = dList_new(512);
    B_secs = dList_new(32);
-   BmFile = dStrconcat(dGethomedir(), "/.dillo/bm.txt", NULL);
+   BmFile = dStrconcat(dGethomedir(), "/.flenser/bm.txt", NULL);
    /* some OSes may need this... */
    address_size = sizeof(struct sockaddr_un);
 
diff --git a/dpi/cookies.c b/dpi/cookies.c
index abfd995..4818cb7 100644
--- a/dpi/cookies.c
+++ b/dpi/cookies.c
@@ -353,13 +353,13 @@ static void Cookies_init(void)
    }
 
    /* Get a stream for the cookies file */
-   filename = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL);
+   filename = dStrconcat(dGethomedir(), "/.flenser/cookies.txt", NULL);
    file_stream = Cookies_fopen(filename, "r+", cookies_txt_header_str);
 
    dFree(filename);
 
    if (!file_stream) {
-      MSG("ERROR: Can't open ~/.dillo/cookies.txt; disabling cookies\n");
+      MSG("ERROR: Can't open ~/.flenser/cookies.txt; disabling cookies\n");
       return;
    }
 
@@ -1126,7 +1126,7 @@ static bool_t Cookies_domain_matches(char *A, char *B)
 
 /*
  * Based on the host, how many internal dots do we need in a cookie domain
- * to make it valid? e.g., "org" is not on the list, so dillo.org is a safe
+ * to make it valid? e.g., "org" is not on the list, so flenser.org is a safe
  * cookie domain, but "uk" is on the list, so ac.uk is not safe.
  *
  * This is imperfect, but it's something. Specifically, checking for these
@@ -1426,7 +1426,7 @@ static int Cookie_control_init(void)
    bool_t enabled = FALSE;
 
    /* Get a file pointer */
-   filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
+   filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
    stream = Cookies_fopen(filename, "r", "DEFAULT DENY\n");
    dFree(filename);
 
diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index b669ae2..4c69c05 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -324,7 +324,7 @@ DLItem::DLItem(const char *full_filename, const char *url, const char *user_agen
    /* avoid malicious SMTP relaying with FTP urls */
    if (dStrnAsciiCasecmp(esc_url, "ftp:/", 5) == 0)
       Filter_smtp_hack(esc_url);
-   cookies_path = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL);
+   cookies_path = dStrconcat(dGethomedir(), "/.flenser/cookies.txt", NULL);
    dl_argv.clear();
    dl_argv.push_back( (char*)"wget" );
    if (stat(fullname, &ss) == 0)
diff --git a/dpid/dpi.c b/dpid/dpi.c
index efd9f01..e6adf07 100644
--- a/dpid/dpi.c
+++ b/dpid/dpi.c
@@ -33,7 +33,7 @@
  */
 char *a_Dpi_sockdir_file(void)
 {
-   char *dpi_socket_dir, *dirfile_path = "/.dillo/dpi_socket_dir";
+   char *dpi_socket_dir, *dirfile_path = "/.flenser/dpi_socket_dir";
 
    dpi_socket_dir = dStrconcat(dGethomedir(), dirfile_path, NULL);
    return dpi_socket_dir;
@@ -53,7 +53,7 @@ char *a_Dpi_rd_dpi_socket_dir(char *dirname)
    FILE *dir;
    char *sockdir = NULL, *rcpath;
 
-   rcpath = dStrconcat(dGethomedir(), "/.dillo", NULL);
+   rcpath = dStrconcat(dGethomedir(), "/.flenser", NULL);
 
    /* If .dillo does not exist it is an unrecoverable error */
    if (access(rcpath, F_OK) == -1) {
diff --git a/dpid/dpi_socket_dir.c b/dpid/dpi_socket_dir.c
index 59a1aee..b48efb9 100644
--- a/dpid/dpi_socket_dir.c
+++ b/dpid/dpi_socket_dir.c
@@ -78,7 +78,7 @@ char *mk_sockdir(void)
 {
    char *template, *logname;
 
-   logname = getenv("LOGNAME") ? getenv("LOGNAME") : "dillo";
+   logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser";
    template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
    if (a_Misc_mkdtemp(template) == NULL) {
       ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
@@ -90,7 +90,7 @@ char *mk_sockdir(void)
 }
 
 /*! Create socket directory if it does not exist and save its name in
- * ~/.dillo/dpi_socket_dir.
+ * ~/.flenser/dpi_socket_dir.
  * \Return
  * \li Socket directory name on success
  * \li NULL on failure.
diff --git a/dpid/dpid.c b/dpid/dpid.c
index 29cc072..583551f 100644
--- a/dpid/dpid.c
+++ b/dpid/dpid.c
@@ -198,8 +198,8 @@ char *get_dpi_dir(char *dpidrc)
 
    if (!rcline) {
       ERRMSG("dpi_dir", "Failed to find a dpi_dir entry in dpidrc", 0);
-      MSG_ERR("Put your dillo plugins path in %s\n", dpidrc);
-      MSG_ERR("e.g. dpi_dir=/usr/local/lib/dillo/dpi\n");
+      MSG_ERR("Put your flenser plugins path in %s\n", dpidrc);
+      MSG_ERR("e.g. dpi_dir=/usr/local/lib/flenser/dpi\n");
       MSG_ERR("with no leading spaces.\n");
       value = NULL;
    } else {
@@ -284,7 +284,7 @@ int get_dpi_attr(char *dpi_dir, char *service, struct dp *dpi_attr)
 
 /*! Register a service
  * Retrieves attributes for "service" and stores them
- * in dpi_attr. It looks for "service" in ~/.dillo/dpi
+ * in dpi_attr. It looks for "service" in ~/.flenser/dpi
  * first, and then in the system wide dpi directory.
  * Caller must allocate memory for dpi_attr.
  * \Return
@@ -383,7 +383,7 @@ int register_all(struct dp **attlist)
       exit(1);
    }
 
-   /* Get list of services in user's .dillo/dpi directory */
+   /* Get list of services in user's .flenser/dpi directory */
    snum = 0;
    if (user_dpidir) {
       DIR *user_dir_stream = opendir(user_dpidir);
diff --git a/dpid/dpid.h b/dpid/dpid.h
index ed13224..bd76946 100644
--- a/dpid/dpid.h
+++ b/dpid/dpid.h
@@ -23,7 +23,7 @@
 #define MSGLEN 50
 #define DPID_BASE_PORT (IPPORT_USERRESERVED + 20)
 
-/*! \TODO: Should read this from dillorc */
+/*! \TODO: Should read this from flenserrc */
 #define SRS_NAME "dpid.srs"
 extern char *srs_name;
 
diff --git a/dpid/dpid_common.h b/dpid/dpid_common.h
index d64e0e8..587c22d 100644
--- a/dpid/dpid_common.h
+++ b/dpid/dpid_common.h
@@ -22,9 +22,9 @@
 #define MSG(...)  printf("[dpid]: " __VA_ARGS__)
 #define MSG_ERR(...)  fprintf(stderr, "[dpid]: " __VA_ARGS__)
 
-#define dotDILLO_DPI ".dillo/dpi"
-#define dotDILLO_DPIDRC ".dillo/dpidrc"
-#define dotDILLO_DPID_COMM_KEYS ".dillo/dpid_comm_keys"
+#define dotDILLO_DPI ".flenser/dpi"
+#define dotDILLO_DPIDRC ".flenser/dpidrc"
+#define dotDILLO_DPID_COMM_KEYS ".flenser/dpid_comm_keys"
 
 #define ERRMSG(CALLER, CALLED, ERR)\
  errmsg(CALLER, CALLED, ERR, __FILE__, __LINE__)
diff --git a/dpid/dpidc.c b/dpid/dpidc.c
index b506a3f..8947384 100644
--- a/dpid/dpidc.c
+++ b/dpid/dpidc.c
@@ -32,7 +32,7 @@ static char SharedKey[32];
 
 static void print_usage(const char *prgname)
 {
-   fprintf(stderr,"Control program for the Dillo plugin daemon\n"
+   fprintf(stderr,"Control program for the Flenser plugin daemon\n"
                   "Usage: %s {stop|register|chat}\n\n", prgname);
 }
 
@@ -52,7 +52,7 @@ static int Dpi_read_comm_keys(int *port)
    char *fname, *rcline = NULL, *tail;
    int i, ret = -1;
 
-   fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
+   fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
    if ((In = fopen(fname, "r")) == NULL) {
       MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
    } else if ((rcline = dGetline(In)) == NULL) {
diff --git a/dpip/dpip.c b/dpip/dpip.c
index f4b4add..2f4dd7a 100644
--- a/dpip/dpip.c
+++ b/dpip/dpip.c
@@ -212,7 +212,7 @@ int a_Dpip_check_auth(const char *auth_tag)
       return ret;
    }
 
-   fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
+   fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
    if ((In = fopen(fname, "r")) == NULL) {
       MSG_ERR("[a_Dpip_check_auth] %s\n", dStrerror(errno));
    } else if ((rcline = dGetline(In)) == NULL) {
diff --git a/dillo-install-hyphenation b/flenser-install-hyphenation
similarity index 97%
rename from dillo-install-hyphenation
rename to flenser-install-hyphenation
index 8700e56..f930d64 100755
--- a/dillo-install-hyphenation
+++ b/flenser-install-hyphenation
@@ -45,7 +45,7 @@ if (-e $makefile) {
    }
 }
 
-$targetdir = "$prefix/lib/dillo/hyphenation";
+$targetdir = "$prefix/lib/flenser/hyphenation";
 
 if (!GetOptions ("host=s" => \$host,
                  "basesourcedir=s" => \$basesourcedir,
@@ -74,7 +74,7 @@ Options:
                               /language/hyph-utf8/tex/generic/hyph-utf8...
                               .../patterns/txt is added (default: /ctan/)
    -t, --targetdir=DIR        where to install the hyphenation patterns
-                              (default: where they are read by dillo)
+                              (default: where they are read by flenser)
 EOT
 } else {
    if ($sourcedir eq "") {
diff --git a/dillo.desktop b/flenser.desktop
similarity index 94%
rename from dillo.desktop
rename to flenser.desktop
index 0341c58..38599bc 100644
--- a/dillo.desktop
+++ b/flenser.desktop
@@ -3,7 +3,7 @@ GenericName=Web Browser
 Name=Flenser
 Comment=Fast and small graphical web browser
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
-Exec=dillo %U
+Exec=flenser %U
 Icon=dillo
 Terminal=false
 Type=Application
diff --git a/dillorc b/flenserrc
similarity index 95%
rename from dillorc
rename to flenserrc
index 8bc5ab8..f3580c3 100644
--- a/dillorc
+++ b/flenserrc
@@ -1,4 +1,4 @@
-# dillorc
+# flenserrc
 # Sample dillo initialization file.
 #
 # Lines that start with a '#' are comments.
@@ -200,15 +200,15 @@
 # Format: search_url="[prefix ][<label> ]<url>"
 # You can enable multiple search_url strings at once and select from among
 # them at runtime, with the first being the default.
-# (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+# (the prefix serves to search from the Location Bar. e.g. "dd flenser image")
 search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&kd=-1&q=%s"
 search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
 search_url="Free Dictionary http://www.thefreedictionary.com/%s"
 search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
 search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 
-# If set, dillo will ask web servers to send pages in this language.
-# This setting does NOT change dillo's user interface.
+# If set, Flenser will ask web servers to send pages in this language.
+# This setting does NOT change Flenser's user interface.
 # Format explained: www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
 # Language-REGION values: www.iana.org/assignments/language-subtag-registry
 # (by default, no Accept-Language header is sent)
@@ -219,7 +219,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 # Maximum number of simultaneous TCP connections to a single server or proxy.
 # http_max_conns=6
 
-# If enabled, Dillo will reuse HTTP connections to a server or proxy when
+# If enabled, Flenser will reuse HTTP connections to a server or proxy when
 # possible rather than making a new connection for every request for a new
 # page/image/stylesheet.
 #http_persistent_conns=YES
@@ -233,7 +233,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 # HSTS directives are not saved between browser sessions.
 #http_strict_transport_security=YES
 
-# If enabled, Dillo will force all HTTP connections to be upgraded to
+# If enabled, Flenser will force all HTTP connections to be upgraded to
 # a more secure HTTPS connection. This will prevent sites from loading
 # if they only support HTTP.
 #http_force_https=NO
@@ -247,7 +247,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 #(by default, no proxy is used)
 
 # If you need to provide a  user/password pair for the proxy,
-# set the proxy user name here and Dillo will ask for the password later.
+# set the proxy user name here and Flenser will ask for the password later.
 # http_proxyuser="joe"
 #(by default, no proxy is used)
 
@@ -266,7 +266,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 
 # Set the HTTP User-Agent header.
 # This can be useful for privacy and for working around servers who think
-# Dillo is less capable than it really is. However, if you pretend to use a
+# Flenser is less capable than it really is. However, if you pretend to use a
 # different browser, servers may send you pages that work with the features
 # and bugs of that other browser -- or even disallow access in cases like
 # wget or googlebot. Remember this before submitting bug reports.
@@ -276,6 +276,8 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
 # http_user_agent="Mozilla/5.0 (Windows NT 6.1; WOW64; rv:28.0) Gecko/20100101 Firefox/28.0"
 # http_user_agent="Wget/1.13.4 (linux-gnu)"
 #The default is "Dillo/"+current_version_number
+# ^^^^ Is it still?  Did I get to changing the User Agent part?  I can check it with my
+# HTTP servers. -- ADAM
 
 #-------------------------------------------------------------------------
 #                            COLORS SECTION
@@ -380,7 +382,7 @@ ui_tab_bg_color=#b7beb7
 #ui_tab_bg_color=#cac682
 
 
-# Size of dillo panel
+# Size of flenser panel
 # tiny   : buttons, location, and progress boxes in one row
 # small  : location in one row, buttons + progress boxes in another
 # medium : adds text labels to buttons and boxes
@@ -390,7 +392,7 @@ ui_tab_bg_color=#b7beb7
 
 #small_icons=NO
 
-# Here you can choose to hide some widgets of the dillo panel...
+# Here you can choose to hide some widgets of the flenser panel...
 #show_back=YES
 #show_forw=YES
 #show_home=YES
@@ -409,7 +411,7 @@ ui_tab_bg_color=#b7beb7
 # Show tooltip popups for the UI
 #show_ui_tooltip=YES
 
-# Start dillo with the panels hidden?
+# Start flenser with the panels hidden?
 #fullwindow_start=NO
 
 # When filling out forms, our default behaviour is to submit on enterpress,
@@ -442,7 +444,7 @@ ui_tab_bg_color=#b7beb7
 # You can hold SHIFT to temporarily revert this behaviour.
 #focus_new_tab=NO
 
-# Ask before quitting Dillo with more than one window or tab open.
+# Ask before quitting Flenser with more than one window or tab open.
 #show_quit_dialog=NO
 
 #-------------------------------------------------------------------------
@@ -466,4 +468,4 @@ ui_tab_bg_color=#b7beb7
 
 
 # -----------------------------------------------------------------------
-# dillorc ends here.
+# flenserrc ends here.
diff --git a/install-dpi-local b/install-dpi-local
index 033918f..6985a4a 100755
--- a/install-dpi-local
+++ b/install-dpi-local
@@ -3,7 +3,7 @@
 # Install the dpi framework programs inside the user's account.
 #
 
-BASE="$HOME/.dillo"
+BASE="$HOME/.flenser"
 BASE2="$BASE/dpi"
 
 if [ -r $BASE/dpi_socket_dir ] ; then
diff --git a/src/IO/about.c b/src/IO/about.c
index f22d992..33dae43 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -44,7 +44,7 @@ const char *const AboutSplash=
 "right corner at any time. Here are some tips to get you started:</p>\n"
 "\n"
 "<ul>\n"
-"  <li>The main configuration file is at <code>~/.dillo/dillorc</code>.</li>\n"
+"  <li>The main configuration file is at <code>~/.flenser/flenserrc</code>.</li>\n"
 "  <li>Most actions can also be done by using the <em>keyboard</em>.</li>\n"
 "  <li>Cookies are <em>disabled by default</em>.</li>\n"
 "</ul>\n"
diff --git a/src/IO/dpi.cc b/src/IO/dpi.cc
index 16049e8..6850e90 100644
--- a/src/IO/dpi.cc
+++ b/src/IO/dpi.cc
@@ -349,7 +349,7 @@ static int Dpi_start_dpid(void)
    pid = fork();
    if (pid == 0) {
       /* This is the child process.  Execute the command. */
-      char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
+      char *path1 = dStrconcat(dGethomedir(), "/.flenser/dpid", NULL);
       dClose(st_pipe[0]);
       if (execl(path1, "dpid", (char*)NULL) == -1) {
          dFree(path1);
@@ -397,7 +397,7 @@ static int Dpi_read_comm_keys(int *port)
    char *fname, *rcline = NULL, *tail;
    int i, ret = -1;
 
-   fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
+   fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
    if ((In = fopen(fname, "r")) == NULL) {
       MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
    } else if ((rcline = dGetline(In)) == NULL) {
diff --git a/src/IO/tls_mbedtls.c b/src/IO/tls_mbedtls.c
index 333104f..20cfca2 100644
--- a/src/IO/tls_mbedtls.c
+++ b/src/IO/tls_mbedtls.c
@@ -294,7 +294,7 @@ static void Tls_load_certificates()
       }
    }
 
-   userpath = dStrconcat(dGethomedir(), "/.dillo/certs/", NULL);
+   userpath = dStrconcat(dGethomedir(), "/.flenser/certs/", NULL);
    Tls_load_certificates_from_path(userpath);
    dFree(userpath);
 
diff --git a/src/IO/tls_openssl.cc b/src/IO/tls_openssl.cc
index d9682e3..6a79901 100644
--- a/src/IO/tls_openssl.cc
+++ b/src/IO/tls_openssl.cc
@@ -240,7 +240,7 @@ static void Tls_load_certificates(void)
          X509_LOOKUP_add_dir(lookup, ca_paths[u], X509_FILETYPE_PEM);
    }
 
-   userpath = dStrconcat(dGethomedir(), "/.dillo/certs/", NULL);
+   userpath = dStrconcat(dGethomedir(), "/.flenser/certs/", NULL);
    X509_LOOKUP_add_dir(lookup, userpath, X509_FILETYPE_PEM);
    dFree(userpath);
 
@@ -330,14 +330,14 @@ static int Tls_save_certificate_home(X509 * cert)
    uint_t i = 0;
    int ret = 1;
 
-   /* Attempt to create .dillo/certs blindly - check later */
-   snprintf(buf, 4096, "%s/.dillo/", dGethomedir());
+   /* Attempt to create .flenser/certs blindly - check later */
+   snprintf(buf, 4096, "%s/.flenser/", dGethomedir());
    mkdir(buf, 01777);
-   snprintf(buf, 4096, "%s/.dillo/certs/", dGethomedir());
+   snprintf(buf, 4096, "%s/.flenser/certs/", dGethomedir());
    mkdir(buf, 01777);
 
    do {
-      snprintf(buf, 4096, "%s/.dillo/certs/%lx.%u",
+      snprintf(buf, 4096, "%s/.flenser/certs/%lx.%u",
                dGethomedir(), X509_subject_name_hash(cert), i);
 
       fp=fopen(buf, "r");
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b02ac7..bfb3307 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,9 @@ AM_CXXFLAGS = @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
 
 SUBDIRS = IO
 
-bin_PROGRAMS = dillo
+bin_PROGRAMS = flenser
 
-dillo_LDADD = \
+flenser_LDADD = \
 	$(top_builddir)/dlib/libDlib.a \
 	$(top_builddir)/dpip/libDpip.a \
 	IO/libDiof.a \
@@ -23,8 +23,8 @@ dillo_LDADD = \
 	@LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBWEBP_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \
 	@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@ @LIBSSL_LIBS@
 
-dillo_SOURCES = \
-	dillo.cc \
+flenser_SOURCES = \
+	flenser.cc \
 	version.cc \
 	version.hh \
 	paths.cc \
@@ -141,8 +141,8 @@ dillo_SOURCES = \
 	xembed.hh
 
 # https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html
-nodist_dillo_SOURCES = commit.h
-version.$(OBJEXT) dillo.$(OBJEXT): commit.h
+nodist_flenser_SOURCES = commit.h
+version.$(OBJEXT) flenser.$(OBJEXT): commit.h
 CLEANFILES = commit.h
 
 if GIT_AVAILABLE
diff --git a/src/cookies.cc b/src/cookies.cc
index 6bb0579..20454ea 100644
--- a/src/cookies.cc
+++ b/src/cookies.cc
@@ -249,7 +249,7 @@ static int Cookie_control_init(void)
    bool_t enabled = FALSE;
 
    /* Get a file pointer */
-   filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
+   filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
    stream = Cookies_fopen(filename, const_cast< char * >( "DEFAULT DENY\n" ));
    dFree(filename);
 
diff --git a/src/domainrc b/src/domainrc
index 60747ea..393f014 100644
--- a/src/domainrc
+++ b/src/domainrc
@@ -1,6 +1,6 @@
-# domainrc - Dillo cross-domain request rules file.
+# domainrc - Flenser cross-domain request rules file.
 #
-# Here you can tell Dillo what to do when one site wants to retrieve resources
+# Here you can tell Flenser what to do when one site wants to retrieve resources
 # (e.g., images, style sheets, redirection) from a different site.
 #
 # Lines that begin with a '#' are comments.
diff --git a/src/dillo.cc b/src/flenser.cc
similarity index 98%
rename from src/dillo.cc
rename to src/flenser.cc
index 94e4288..c245765 100644
--- a/src/dillo.cc
+++ b/src/flenser.cc
@@ -107,7 +107,7 @@ static const CLI_options Options[] = {
    {"-v", "--version",    0, DILLO_CLI_VERSION,
     "  -v, --version          Display version info and exit."},
    {"-x", "--xid",        1, DILLO_CLI_XID,
-    "  -x, --xid XID          Open first Dillo window in an existing\n"
+    "  -x, --xid XID          Open first Flenser window in an existing\n"
     "                         window whose window ID is XID."},
    {NULL, NULL, 0, DILLO_CLI_NONE, NULL}
 };
@@ -460,13 +460,13 @@ int main(int argc, char **argv)
    // set the default values for the preferences
    a_Prefs_init();
 
-   // create ~/.dillo if not present
+   // create ~/.flenser if not present
    Paths::init();
 
    // initialize default key bindings
    Keys::init();
 
-   // parse dillorc
+   // parse flenserrc
    if ((fp = Paths::getPrefsFP(PATHS_RC_PREFS))) {
       PrefsParser::parse(fp);
    }
@@ -518,7 +518,7 @@ int main(int argc, char **argv)
    }
 
    // Sets WM_CLASS hint on X11
-   Fl_Window::default_xclass("dillo");
+   Fl_Window::default_xclass("flenser");
 
    Fl::scheme(prefs.theme);
 
@@ -545,7 +545,7 @@ int main(int argc, char **argv)
                                             // only way to set the
                                             // default font in fltk1.3
 
-   fl_message_title_default("Dillo: Message");
+   fl_message_title_default("Flenser: Message");
 
    // Create a new UI/bw pair
    BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, xid, NULL);
diff --git a/src/paths.cc b/src/paths.cc
index 910a209..ca9edfc 100644
--- a/src/paths.cc
+++ b/src/paths.cc
@@ -42,7 +42,7 @@ void Paths::init(void)
           dStrerror(errno));
    }
 
-   path = dStrconcat(dGethomedir(), "/.dillo", NULL);
+   path = dStrconcat(dGethomedir(), "/.flenser", NULL);
    if (stat(path, &st) == -1) {
       if (errno == ENOENT) {
          MSG("paths: Creating directory '%s/'\n", path);
@@ -80,7 +80,7 @@ void Paths::free(void)
 FILE *Paths::getPrefsFP(const char *rcFile)
 {
    FILE *fp;
-   char *path = dStrconcat(dGethomedir(), "/.dillo/", rcFile, NULL);
+   char *path = dStrconcat(dGethomedir(), "/.flenser/", rcFile, NULL);
 
    if (!(fp = fopen(path, "r"))) {
       MSG("paths: Cannot open file '%s': %s\n", path, dStrerror(errno));
diff --git a/src/paths.hh b/src/paths.hh
index 0ca42d3..43940bc 100644
--- a/src/paths.hh
+++ b/src/paths.hh
@@ -12,7 +12,7 @@
 #ifndef __PATHS_HH__
 #define __PATHS_HH__
 
-#define PATHS_RC_PREFS  "dillorc"
+#define PATHS_RC_PREFS  "flenserrc"
 #define PATHS_RC_KEYS   "keysrc"
 #define PATHS_RC_DOMAIN "domainrc"
 #define PATHS_HSTS_PRELOAD "hsts_preload"
diff --git a/src/styleengine.cc b/src/styleengine.cc
index f8a8ec8..92e983e 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -1077,7 +1077,7 @@ void StyleEngine::init () {
 
 void StyleEngine::buildUserStyle () {
    Dstr *style;
-   char *filename = dStrconcat(dGethomedir(), "/.dillo/style.css", NULL);
+   char *filename = dStrconcat(dGethomedir(), "/.flenser/style.css", NULL);
 
    if ((style = a_Misc_file2dstr(filename))) {
       CssParser::parse (NULL,NULL,cssContext,style->str, style->len,CSS_ORIGIN_USER);
diff --git a/src/uicmd.cc b/src/uicmd.cc
index e9c6e09..a74bb69 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -298,7 +298,7 @@ UI *CustTabs::add_new_tab(UI *old_ui, int focus)
    /* The UI is constructed in a comfortable fitting size, and then resized
     * so FLTK doesn't get confused later with even smaller dimensions! */
    current(0);
-   UI *new_ui = new UI(0,0,UI_MIN_W,UI_MIN_H,"Dillo:",old_ui);
+   UI *new_ui = new UI(0,0,UI_MIN_W,UI_MIN_H,"Flenser:",old_ui);
    new_ui->resize(0,ctab_h,Wizard->w(),Wizard->h());
    new_ui->tabs(this);
    Wizard->add(new_ui);
@@ -565,7 +565,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
    Fl_Window *win;
 
    if (ww <= 0 || wh <= 0) {
-      // Set default geometry from dillorc.
+      // Set default geometry from flenserrc.
       ww = prefs.width;
       wh = prefs.height;
    }
diff --git a/src/version.cc b/src/version.cc
index b3791be..f29d736 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -1,6 +1,7 @@
 /*
- * Dillo web browser
+ * Flenser web browser
  *
+ * Copyright 2025 ADAM David Alan Martin <adam@recursive.engineer>
  * Copyright 2024 Rodrigo Arias Mallo <rodarima@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/test/unit/cookies.c b/test/unit/cookies.c
index 1469d72..1170e29 100644
--- a/test/unit/cookies.c
+++ b/test/unit/cookies.c
@@ -119,7 +119,7 @@ static int Dpi_read_comm_keys(int *port)
    char *fname, *rcline = NULL, *tail;
    int i, ret = -1;
 
-   fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
+   fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
    if ((In = fopen(fname, "r")) == NULL) {
       MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
    } else if ((rcline = dGetline(In)) == NULL) {
@@ -201,7 +201,7 @@ static int Dpi_start_dpid(void)
    pid = fork();
    if (pid == 0) {
       /* This is the child process.  Execute the command. */
-      char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
+      char *path1 = dStrconcat(dGethomedir(), "/.flenser/dpid", NULL);
       Dpi_close_fd(st_pipe[0]);
       if (execl(path1, "dpid", (char*)NULL) == -1) {
          dFree(path1);
@@ -904,7 +904,7 @@ int Cookies_rc_check()
    bool_t default_deny = TRUE;
 
    /* Get a file pointer */
-   filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
+   filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
    stream = fopen(filename, "r");
    dFree(filename);