diff --git a/css/base/radarr/radarr-base.css b/css/base/radarr/radarr-base.css
index d141860c23..e3f8de8e13 100644
--- a/css/base/radarr/radarr-base.css
+++ b/css/base/radarr/radarr-base.css
@@ -108,7 +108,8 @@
 }
 
 [class*="MovieFileEditorTable-container-"],
-[class*="MovieHistoryTable-container-"] {
+[class*="MovieHistoryTable-container-"],
+[class*="MovieTitlesTable-container-"] {
     border: 1px solid transparent;
     background: var(--transparency-dark-25);
 }
diff --git a/docker/root/defaults/default b/docker/root/defaults/default.conf
similarity index 87%
rename from docker/root/defaults/default
rename to docker/root/defaults/default.conf
index 9be9ed8724..e839d8aad2 100644
--- a/docker/root/defaults/default
+++ b/docker/root/defaults/default.conf
@@ -1,34 +1,32 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    server_name _;
-
-    ssl_certificate /config/keys/cert.crt;
-    ssl_certificate_key /config/keys/cert.key;
-
-    index index.html index.htm index.php;
-
-    location / {
-        alias /config/www/;
-        try_files $uri $uri/ =404;
-    }
-    location  /themepark {return 302  $scheme://$http_host/themepark/;}
-    location /themepark/ {
-        alias /config/www/;
-        sub_filter_types *;
-        sub_filter 'url("/css/' 'url("/themepark/css/';
-        sub_filter 'url(/resources/' 'url(/themepark/resources/';
-        sub_filter_once off;
-        try_files $uri $uri/ =404;
-    }
-
-    # Don't cache
-    add_header Last-Modified $date_gmt;
-    add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-    if_modified_since off;
-    expires -1;
-    etag off;
-}
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name _;
+
+    index index.html index.htm index.php;
+
+    location / {
+        alias /config/www/;
+        try_files $uri $uri/ =404;
+    }
+    location  /themepark {return 302  $scheme://$http_host/themepark/;}
+    location /themepark/ {
+        alias /config/www/;
+        sub_filter_types *;
+        sub_filter 'url("/css/' 'url("/themepark/css/';
+        sub_filter 'url(/resources/' 'url(/themepark/resources/';
+        sub_filter_once off;
+        try_files $uri $uri/ =404;
+    }
+
+    # Don't cache
+    add_header Last-Modified $date_gmt;
+    add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+    if_modified_since off;
+    expires -1;
+    etag off;
+}
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
new file mode 100644
index 0000000000..9b563c6fcc
--- /dev/null
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
@@ -0,0 +1,10 @@
+
+████████╗██╗  ██╗███████╗███╗   ███╗███████╗   ██████╗  █████╗ ██████╗ ██╗  ██╗
+╚══██╔══╝██║  ██║██╔════╝████╗ ████║██╔════╝   ██╔══██╗██╔══██╗██╔══██╗██║ ██╔╝
+   ██║   ███████║█████╗  ██╔████╔██║█████╗     ██████╔╝███████║██████╔╝█████╔╝ 
+   ██║   ██╔══██║██╔══╝  ██║╚██╔╝██║██╔══╝     ██╔═══╝ ██╔══██║██╔══██╗██╔═██╗ 
+   ██║   ██║  ██║███████╗██║ ╚═╝ ██║███████╗██╗██║     ██║  ██║██║  ██║██║  ██╗
+   ╚═╝   ╚═╝  ╚═╝╚══════╝╚═╝     ╚═╝╚══════╝╚═╝╚═╝     ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝
+                                                                               
+                                 Made by @gilbN                                
+                             https://theme-park.dev                            
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type
new file mode 100644
index 0000000000..3d92b15f2d
--- /dev/null
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up
new file mode 100644
index 0000000000..9af9ece1dd
--- /dev/null
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up
@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the end of the themepark init process
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/dependencies.d/init-version-checks b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/dependencies.d/init-version-checks
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run
old mode 100644
new mode 100755
similarity index 50%
rename from docker/root/etc/cont-init.d/50-config
rename to docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run
index 856f3ee24c..71aa37c103
--- a/docker/root/etc/cont-init.d/50-config
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run
@@ -1,21 +1,5 @@
 #!/usr/bin/with-contenv bash
 
-echo '
-----------------------------------------------------------------------------------------
-     dP   dP                                                                  dP        
-     88   88                                                                  88        
-   d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   
-     88   88   `88 88ooood8 88  88  88 88ooood8    88.  `88 88   `88 88   `88 88888.    
-     88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88    88 88       88  `8b.  
-     dP   dP    dP `88888P  dP  dP  dP `88888P  88 88Y888P  `88888P8 dP       dP   `YP  
-                                                   88                                   
-                                                   dP                                   
-                                                                                        
-                                       Made by @gilbN                                   
-                                    https://theme-park.dev                              
-----------------------------------------------------------------------------------------'
-
-
 # Display variables for troubleshooting 
 echo -e "[theme.park-init] Variables set:\\n\
 PUID=${PUID}\\n\
@@ -31,13 +15,13 @@ case ${TP_URLBASE} in
     ;;
 esac
 
-DEFAULT='/defaults/default'
+DEFAULT='/defaults/default.conf'
 if [[ ${TP_URLBASE} ]]; then
     if ! grep -q "${TP_URLBASE}" "${DEFAULT}"; then
         sed -i "s/themepark/${TP_URLBASE}/g" ${DEFAULT}
     fi
 fi
-cp /defaults/default /config/nginx/site-confs
+cp /defaults/default.conf /config/nginx/site-confs
 
 # make our folders and links
 mkdir -p \
@@ -60,7 +44,7 @@ echo '[theme.park-init] Copying mods into /config/docker-mods'
 
 echo '[theme.park-init] Running themes.py and creating CSS files'
 python3 /config/www/themes.py
-
+echo '[theme.park-init] done.'
 # permissions
 chown -R abc:abc \
     /config
\ No newline at end of file
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type
new file mode 100644
index 0000000000..3d92b15f2d
--- /dev/null
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up
new file mode 100644
index 0000000000..081a3ebed2
--- /dev/null
+++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-themepark/run
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-themepark b/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-themepark
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
index b5df2588a9..e56c810d78 100644
--- a/linux-amd64.Dockerfile
+++ b/linux-amd64.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16
 
 # set version label
 ARG BUILD_DATE
diff --git a/linux-arm-v7.Dockerfile b/linux-arm-v7.Dockerfile
index 8992e1a53f..aac929d344 100644
--- a/linux-arm-v7.Dockerfile
+++ b/linux-arm-v7.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
index 3d338d7282..e11438731e 100644
--- a/linux-arm64.Dockerfile
+++ b/linux-arm64.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE