diff --git a/debian.sh b/debian.sh
index 0f08d9e..2bbce17 100755
--- a/debian.sh
+++ b/debian.sh
@@ -51,10 +51,11 @@ DEBIAN_RELEASE='testing'
 FLATPAKS+=( app/net.brinkervii.grapejuice org.kde.kdenlive )
 
 #Packages
-SHARED_DESKTOP_APPS=" gnome-core gimp gnome-tweaks gajim evolution nextcloud-desktop telegram-desktop gnome-photos handbrake vlc libreoffice "
 PACKAGES=" libglu1-mesa preload podman-compose yt-dlp aardvark-dns apt-transport-https zram-tools samba samba-common nfs-common nfs-kernel-server linux-cpupower locales redis cockpit cockpit-machines cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged acpid podman pulseaudio ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat postgresql redis neofetch fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
+SHARED_DESKTOP_APPS=" gnome-core gimp gnome-tweaks gajim evolution nextcloud-desktop telegram-desktop gnome-photos handbrake vlc libreoffice "
 #REMOVED=" podman-toolbox syncthing "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf "
+
 PACKAGES=$PACKAGES$SHARED_DESKTOP_APPS$VIRTUALIZATION
 SERVICES+=( powertop preload );
 
@@ -116,14 +117,28 @@ systemMounts(){
     mount -t efivarfs none $TARGET/sys/firmware/efi/efivars
 }
 
-additional-software(){
-    wget -O - http://debian.drdteam.org/drdteam.gpg | sudo apt-key add -
-    wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg
-    echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | tee /etc/apt/sources.list.d/element-io.list
+install-vscode(){
     wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg
     echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.gpg ] https://download.vscodium.com/debs vscodium main' | tee /etc/apt/sources.list.d/vscodium.list
+    apt update;apt install -y codium 
+}
+
+install-doom(){
+    wget -O - http://debian.drdteam.org/drdteam.gpg | apt-key add -
     add-apt-repository 'deb http://debian.drdteam.org/ stable multiverse'
-    apt update;apt install -y -o Dpkg::Options::="--force-unsafe-io" element-desktop codium zandronum doomseeker-zandronum
+    apt update;apt install -y zandronum doomseeker-zandronum 
+}
+
+install-element(){
+    wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg
+    echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | tee /etc/apt/sources.list.d/element-io.list
+    apt update;apt install -y element-desktop
+}
+
+additional-software(){
+    install-element
+    install-doom
+    install-vscode
 }
 
 install() {
@@ -134,22 +149,27 @@ install() {
     apt update;apt install debootstrap -y 
     rm -rf /debootstrap 
     debootstrap --arch amd64 $DEBIAN_RELEASE $TARGET https://deb.debian.org/debian
+    apt-tweaks
     systemMounts
     cp -f /etc/resolv.conf $TARGET/etc/
     echo "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > $TARGET/setup.sh 
     echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE main contrib non-free" >>$TARGET/etc/apt/sources.list
     chroot $TARGET /usr/bin/apt update
-    chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y -o Dpkg::Options::="--force-unsafe-io" $PACKAGES"
+    chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y $PACKAGES"
     locale
     accounts
     auto_login
     custom_service_files
     services
-    btrfs-tweaks
     setup_script "$1"
     unmount
 }
 
+apt-tweaks(){
+    echo 'DPkg::Post-Invoke {"/usr/bin/debian.sh snapshot";};' > $TARGET/etc/apt/apt.conf
+    echo 'force-unsafe-io' > $TARGET/etc/dpkg/dpkg.cfg.d/docker-apt-speedup
+}
+
 desktop(){
     systemctl disable --now exim4
     systemctl disable --now cockpit.socket