diff --git a/README.md b/README.md
index 616e3c4..29ac3ac 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@ A self-hosted web IRC client.
 ## About
 
 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.
+support for theming, push notifications, link previews, file uploads and
+more. Fully cross-platform and mobile friendly.
 
 ![Screenshot][screenshot]
 
diff --git a/thelounge/Dockerfile b/thelounge/Dockerfile
index ce963cc..080fa9e 100644
--- a/thelounge/Dockerfile
+++ b/thelounge/Dockerfile
@@ -5,13 +5,25 @@ FROM ${BUILD_FROM}
 # Install packages
 # hadolint ignore=DL3003
 RUN \
-    apk add --no-cache \
-        nodejs-current=11.3.0-r0 \
+    apk add --no-cache --virtual .build-dependencies \
         yarn=1.12.3-r0 \
     \
-    && yarn global add thelounge@3.0.1 \
+    && apk add --no-cache \
+        nodejs-current=11.3.0-r0 \
     \
+    && yarn global add \
+        modclean \
+        thelounge@3.0.1 \
+    \
+    && modclean \
+        --path /usr/local/share/.config/yarn/global \
+        --no-progress \
+        --keep-empty \
+        --run \
+    \
+    && yarn global remove modclean \
     && yarn cache clean \
+    && apk del --purge .build-dependencies \
     && rm -fr /tmp/*
 
 # Copy root filesystem
diff --git a/thelounge/build.json b/thelounge/build.json
index c45bff1..7d11145 100644
--- a/thelounge/build.json
+++ b/thelounge/build.json
@@ -4,6 +4,7 @@
         "aarch64": "hassioaddons/base-aarch64:3.0.0",
         "amd64": "hassioaddons/base-amd64:3.0.0",
         "armhf": "hassioaddons/base-armhf:3.0.0",
+        "armv7": "hassioaddons/base-armv7:3.0.0",
         "i386": "hassioaddons/base-i386:3.0.0"
     },
     "squash": false
diff --git a/thelounge/rootfs/etc/cont-init.d/20-setup.sh b/thelounge/rootfs/etc/cont-init.d/20-setup.sh
index cb895ff..d5bc533 100644
--- a/thelounge/rootfs/etc/cont-init.d/20-setup.sh
+++ b/thelounge/rootfs/etc/cont-init.d/20-setup.sh
@@ -12,6 +12,6 @@ if ! bashio::fs.directory_exists "/data/thelounge"; then
 else
     for theme in $(bashio::config "themes")
     do
-        /usr/local/bin/thelounge install "$theme"
+        /usr/local/bin/thelounge install "${theme}"
     done
 fi