diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 0a4a74e..d624762 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -30,7 +30,7 @@ jobs:
           file: ./Dockerfile
           push: true
           provenance: false
-          tags: ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-amd64
+          tags: ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-vanilla-amd64
       
       - name: Build and push image for arm64
         uses: docker/build-push-action@v5
@@ -40,14 +40,14 @@ jobs:
           file: ./Dockerfile.aarch64
           push: true
           provenance: false
-          tags: ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-arm64
+          tags: ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-vanilla-arm64
 
       - name: Create manifest
         run: |
-          docker manifest create ghcr.io/${{ github.repository }}:ubuntu \
-            --amend ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-amd64 \
-            --amend ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-arm64
+          docker manifest create ghcr.io/${{ github.repository }}:ubuntu-vanilla \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-vanilla-amd64 \
+            --amend ghcr.io/${{ github.repository_owner }}/${{ secrets.DEV_REPO }}:ubuntu-vanilla-arm64
 
       - name: Push manifest
         run: |
-          docker manifest push ghcr.io/${{ github.repository }}:ubuntu
+          docker manifest push ghcr.io/${{ github.repository }}:ubuntu-vanilla
diff --git a/Dockerfile b/Dockerfile
index 0c99d90..44da3bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,58 +23,47 @@ RUN \
   echo "**** add icon ****" && \
   curl -o \
     /kclient/public/icon.png \
-    https://raw.githubusercontent.com/tibor309/icons/master/icons/ubuntu/ubuntu_cof_logo_256x256.ico && \
+    https://raw.githubusercontent.com/tibor309/icons/main/icons/ubuntu/ubuntu_cof_logo_256x256.png && \
   curl -o \
     /kclient/public/favicon.ico \
-    https://raw.githubusercontent.com/tibor309/icons/master/icons/ubuntu/ubuntu_cof_icon_32x32.ico && \
+    https://raw.githubusercontent.com/tibor309/icons/main/icons/ubuntu/ubuntu_cof_icon_32x32.ico && \
   echo "**** install packages ****" && \
   add-apt-repository -y ppa:mozillateam/ppa && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
     dbus-x11 \
-    fonts-ubuntu \
+    fonts-cantarell \
     language-pack-en-base \
     language-pack-gnome-en \
     mesa-utils \
     xdg-desktop-portal \
-    ubuntu-desktop \
-    ubuntu-settings \
-    ubuntu-keyring \
-    ubuntu-wallpapers \
-    ubuntu-docs \
+    vanilla-gnome-desktop \
+    vanilla-gnome-default-settings \
     gnome-shell \
     gnome-menus \
     gnome-user-docs \
     gnome-accessibility-themes \
-    yaru-theme-gnome-shell \
-    yaru-theme-gtk \
-    yaru-theme-icon \
-    yaru-theme-sound \
+    gnome-backgrounds \
     gnome-control-center \
     gnome-online-accounts \
     gnome-text-editor \
     gnome-system-monitor \
-    gnome-terminal \
+    gnome-console \
+    nautilus \
     nautilus-extension-gnome-terminal \
     gnome-calculator \
     gnome-clocks \
     gnome-calendar \
     firefox \
-    eog \
+    loupe \
     evince \
     totem \
-    rhythmbox \
+    gnome-music \
     gnome-tweaks && \
   echo "**** remove un-needed packages ****" && \
   apt-get remove -y \
-    gnome-power-manager \
-    gnome-bluetooth \
-    hijra-applet \
-    mailnag \
-    gnome-shell-mailnag \
-    snapd \
-    gnome-shell-pomodoro \
-    gnome-shell-pomodoro-data && \
+    power-profiles-daemon \
+    snapd && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6dee537..1d42b8a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -23,58 +23,47 @@ RUN \
   echo "**** add icon ****" && \
   curl -o \
     /kclient/public/icon.png \
-    https://raw.githubusercontent.com/tibor309/icons/master/icons/ubuntu/ubuntu_cof_logo_256x256.ico && \
+    https://raw.githubusercontent.com/tibor309/icons/main/icons/ubuntu/ubuntu_cof_logo_256x256.png && \
   curl -o \
     /kclient/public/favicon.ico \
-    https://raw.githubusercontent.com/tibor309/icons/master/icons/ubuntu/ubuntu_cof_icon_32x32.ico && \
+    https://raw.githubusercontent.com/tibor309/icons/main/icons/ubuntu/ubuntu_cof_icon_32x32.ico && \
   echo "**** install packages ****" && \
   add-apt-repository -y ppa:mozillateam/ppa && \
   apt-get update && \
   apt-get install --no-install-recommends -y \
     dbus-x11 \
-    fonts-ubuntu \
+    fonts-cantarell \
     language-pack-en-base \
     language-pack-gnome-en \
     mesa-utils \
     xdg-desktop-portal \
-    ubuntu-desktop \
-    ubuntu-settings \
-    ubuntu-keyring \
-    ubuntu-wallpapers \
-    ubuntu-docs \
+    vanilla-gnome-desktop \
+    vanilla-gnome-default-settings \
     gnome-shell \
     gnome-menus \
     gnome-user-docs \
     gnome-accessibility-themes \
-    yaru-theme-gnome-shell \
-    yaru-theme-gtk \
-    yaru-theme-icon \
-    yaru-theme-sound \
+    gnome-backgrounds \
     gnome-control-center \
     gnome-online-accounts \
     gnome-text-editor \
     gnome-system-monitor \
-    gnome-terminal \
+    gnome-console \
+    nautilus \
     nautilus-extension-gnome-terminal \
     gnome-calculator \
     gnome-clocks \
     gnome-calendar \
     firefox \
-    eog \
     evince \
     totem \
-    rhythmbox \
+    loupe \
+    gnome-music \
     gnome-tweaks && \
   echo "**** remove un-needed packages ****" && \
   apt-get remove -y \
-    gnome-power-manager \
-    gnome-bluetooth \
-    hijra-applet \
-    mailnag \
-    gnome-shell-mailnag \
-    snapd \
-    gnome-shell-pomodoro \
-    gnome-shell-pomodoro-data && \
+    power-profiles-daemon \
+    snapd && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/README.md b/README.md
index 1d40717..5166490 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,11 @@
 ## 🖥️ Webtop
-# Ubuntu
-![Ubuntu](https://i.imgur.com/jKuw9Vm.png)
+# Ubuntu Vanilla
+![Ubuntu Vanilla](https://i.imgur.com/o1LuyoF.png)
 
 ## Setup
-To use this desktop, change the docker image tag to `ubuntu`. For setup instructions, go back to the [main page][main_repo].
+To use this desktop, change the docker image tag to `ubuntu-vanilla`. For setup instructions, go back to the [main page][main_repo].
 
 
-> [!NOTE]
-> Theming is a bit broken. Also the desktop might suddenly crash sometimes.
-
 
 
 [main_repo]: https://github.com/tibor309/webtop
diff --git a/root/defaults/gnome.conf b/root/defaults/gnome.conf
index 888413d..57178af 100644
--- a/root/defaults/gnome.conf
+++ b/root/defaults/gnome.conf
@@ -1,11 +1,11 @@
 
 [org/gnome/shell]
-favorite-apps=['firefox.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'rhythmbox.desktop', 'yelp.desktop']
+favorite-apps=['firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.TextEditor.desktop']
 
 [org/gnome/desktop/interface]
-document-font-name='Sans Regular 11'
-font-name='Ubuntu Medium 11'
-monospace-font-name='Ubuntu Mono Regular 13'
+document-font-name='Cantarell 11'
+font-name='Cantarell 11'
+monospace-font-name='Monospace 11'
 
 [org/gnome/desktop/wm/preferences]
-titlebar-font='Ubuntu Bold 11'
+titlebar-font='Cantarell Bold 11'
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 10cb574..d63c98a 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -5,14 +5,15 @@ setterm powerdown 0
 
 # change gnome settings
 gsettings set org.gnome.desktop.lockdown disable-lock-screen true
+gsettings set org.gnome.desktop.lockdown disable-log-out true
 gsettings set org.gnome.desktop.screensaver lock-enabled false
 gsettings set org.gnome.desktop.session idle-delay 0
 
 # set session
 export XDG_SESSION_TYPE=x11
-export DESKTOP_SESSION=ubuntu
-export GNOME_SHELL_SESSION_MODE=ubuntu
-export XDG_CURRENT_DESKTOP=ubuntu:GNOME
+export DESKTOP_SESSION=gnome-xorg
+#export GNOME_SHELL_SESSION_MODE=ubuntu
+export XDG_CURRENT_DESKTOP=GNOME
 
 # set folder locations
 xdg-user-dirs-update --set DESKTOP /config/Desktop
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setupgnome/run b/root/etc/s6-overlay/s6-rc.d/init-setupgnome/run
index 3b8290a..b8eac0c 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-setupgnome/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-setupgnome/run
@@ -2,15 +2,20 @@
 
 # fixes for gnome and flatpaks
 for file in $(find /usr -type f -iname "*login1*"); do rm -v $file; done
-echo "\n\nexport $(dbus-launch)\nexport XDG_CURRENT_DESKTOP=ubuntu:GNOME\nexport XDG_DATA_DIRS=/var/lib/flatpak/exports/share:/config/.local/share/flatpak/exports/share:/usr/local/share:/usr/share\nexport XDG_SESSION_TYPE=x11\nexport DESKTOP_SESSION=ubuntu\nexport GNOME_SHELL_SESSION_MODE=ubuntu" >> /etc/profile
 
 # remove shortuts and panels
 rm -v /usr/share/applications/gnome-network-panel.desktop \
     /usr/share/applications/gnome-sharing-panel.desktop \
     /usr/share/applications/gnome-color-panel.desktop \
-    /usr/share/applications/update-manager.desktop
+    /usr/share/applications/gnome-language-selector.desktop \
+    /usr/share/applications/update-manager.desktop \
+    /usr/share/applications/software-properties-drivers.desktop \
+    /usr/share/applications/software-properties-gtk.desktop
+    
 
 if [ ! -f "/config/.firstsetup" ]; then
+    echo "\n\nexport $(dbus-launch)\nexport XDG_CURRENT_DESKTOP=GNOME\nexport XDG_DATA_DIRS=/var/lib/flatpak/exports/share:/config/.local/share/flatpak/exports/share:/usr/local/share:/usr/share\nexport XDG_SESSION_TYPE=x11\nexport DESKTOP_SESSION=gnome-xorg" >> /etc/profile
+
     mkdir -p /config/.config/{gtk-3.0,gtk-4.0}
     mkdir -p /config/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos}
     touch /config/.firstsetup