diff --git a/README.md b/README.md
index ddb59b3..d056b0b 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,9 @@ A self-hosted web IRC client.
 
 ## About
 
-A self-hosted web IRC client. Uses a modern and sleek interface with support
- for theming, push notifications, link previews, file uploads and more.
- Fully cross-platform and mobile friendly.
+A self-hosted web IRC client that uses a modern and sleek interface with
+ support for theming, push notifications, link previews, file uploads and
+ more. Fully cross-platform and mobile friendly.
 
 ![Screenshot][screenshot]
 
@@ -109,6 +109,8 @@ The private key file to use for SSL.
 The default theme for each user. The pre-installed themes are `default` and
  `morning`. You can add more using the next option.
 
+**Note**: _The theme can still be changed in the settings of the app_
+
 ### Option: `themes`
 
 A list of themes to install which can be found in the [npm registry][themes].
diff --git a/thelounge/.README.j2 b/thelounge/.README.j2
index 565469a..1cfd42e 100644
--- a/thelounge/.README.j2
+++ b/thelounge/.README.j2
@@ -10,9 +10,9 @@ A self-hosted web IRC client.
 
 ## About
 
-A self-hosted web IRC client. Uses a modern and sleek interface with support
- for theming, push notifications, link previews, file uploads and more.
- Fully cross-platform and mobile friendly.
+A self-hosted web IRC client that uses a modern and sleek interface with
+ support for theming, push notifications, link previews, file uploads and
+ more. Fully cross-platform and mobile friendly.
 
 ![Screenshot][screenshot]
 
diff --git a/thelounge/rootfs/etc/services.d/server/finish b/thelounge/rootfs/etc/services.d/server/finish
index 095ea64..a3d7406 100644
--- a/thelounge/rootfs/etc/services.d/server/finish
+++ b/thelounge/rootfs/etc/services.d/server/finish
@@ -1,7 +1,7 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
 # Community Hass.io Add-ons: The Lounge
-# Take down the S6 supervision tree when NGINX fails
+# Take down the S6 supervision tree when the server fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
 if -n { s6-test ${1} -eq 256 }
diff --git a/thelounge/rootfs/etc/services.d/server/run b/thelounge/rootfs/etc/services.d/server/run
index 589c927..5c00772 100644
--- a/thelounge/rootfs/etc/services.d/server/run
+++ b/thelounge/rootfs/etc/services.d/server/run
@@ -1,7 +1,7 @@
 #!/bin/bash
 # ==============================================================================
 # Community Hass.io Add-ons: The Lounge
-# Runs The Lounge
+# Runs The Lounge server
 # ==============================================================================
 # shellcheck disable=SC1091
 source /usr/lib/hassio-addons/base.sh