diff --git a/README.md b/README.md
index 7dc0a10..2728c5f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# ubuntu-debullshit!
+# ubuntu-debullshit! (ubuntu-rolling-debloat, forked by Runa Inoue)
   
-#### An automated script to set-up Ubuntu as it should be. Tested on Ubuntu 22.04 and 23.04
+#### An automated script to set-up Ubuntu as it should be. Tested on Ubuntu LTS and Devel (rolling-build)
 
 <img src="https://raw.githubusercontent.com/polkaulfield/ubuntu-debullshit/main/menu.png" width="500" />
   
@@ -24,16 +24,12 @@ TL;DR, you will end up with a clean GNOME desktop with flatpaks, similar to a fr
 
 #### Preview
 
-<img src="https://raw.githubusercontent.com/polkaulfield/ubuntu-debullshit/main/screenshot.png" width="500" />
+<img src="https://raw.githubusercontent.com/runa-chin/ubuntu-rolling-debloat/main/screenshot.png" width="500" />
 
 #### Installation
 
-I recommend a minimal install of Ubuntu 23.04 to run this. 
-
 You can download the script from the repo or use this oneliner command, there are no dependencies required.
 
-`sudo bash -c "$(wget -qO- https://raw.githubusercontent.com/polkaulfield/ubuntu-debullshit/main/ubuntu-debullshit.sh)"`
+`sudo bash -c "$(wget -qO- https://raw.githubusercontent.com/runa-chin/ubuntu-rolling-debloat/main/ubuntu-debullshit.sh)"`
 
 After the install, reboot and enjoy a clean experience :)
-
-<a href='https://ko-fi.com/polkaulfield' target='_blank'><img height='35' style='border:0px;height:46px;' src='https://az743702.vo.msecnd.net/cdn/kofi3.png?v=0' border='0' alt='Buy Me a Coffee at ko-fi.com' />
diff --git a/ubuntu-debullshit.sh b/ubuntu-debullshit.sh
index 83b2479..f60e426 100644
--- a/ubuntu-debullshit.sh
+++ b/ubuntu-debullshit.sh
@@ -37,17 +37,18 @@ disable_terminal_ads() {
 }
 
 update_system() {
-    apt update && apt upgrade -y
+    apt update & apt upgrade --auto-remove -y
 }
 
 cleanup() {
     apt autoremove -y
 }
 
-setup_flathub() {
+setup_flathub_and_pacstall() {
     apt install flatpak -y
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    apt install --install-suggests gnome-software -y
+    apt install --no-install-recommends gnome-software gnome-software-plugin-flatpak synaptic gdebi -y
+    sudo bash -c "$(curl -fsSL https://pacstall.dev/q/install || wget -q https://pacstall.dev/q/install -O -)"
 }
 
 gsettings_wrapper() {
@@ -58,16 +59,13 @@ gsettings_wrapper() {
 }
 
 set_fonts() {
-	gsettings_wrapper set org.gnome.desktop.interface monospace-font-name "Monospace 10"
+	gsettings_wrapper set org.gnome.desktop.interface monospace-font-name "Ubuntu Mono 10"
 }
 
 setup_vanilla_gnome() {
     apt install qgnomeplatform-qt5 -y
-    apt install gnome-session fonts-cantarell adwaita-icon-theme-full gnome-backgrounds gnome-tweaks vanilla-gnome-default-settings -y && apt remove ubuntu-session yaru-theme-gnome-shell yaru-theme-gtk yaru-theme-icon yaru-theme-sound -y
+    apt install gnome-session fonts-cantarell papirus-icon-theme gnome-backgrounds gnome-shell-extension-manager gnome-tweaks vanilla-gnome-default-settings vanilla-gnome-desktop -y && apt remove ubuntu-session yaru-theme-gnome-shell yaru-theme-gtk yaru-theme-icon yaru-theme-sound -y
     set_fonts
-    if command -v flatpak; then
-        flatpak install -y app/com.mattjakeman.ExtensionManager/x86_64/stable
-    fi
 }
 
 install_adwgtk3() {
@@ -80,14 +78,14 @@ install_adwgtk3() {
     if [ "$(gsettings_wrapper get org.gnome.desktop.interface color-scheme | tail -n 1)" == ''\''prefer-dark'\''' ]; then
         gsettings_wrapper set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
         gsettings_wrapper set org.gnome.desktop.interface color-scheme prefer-dark
+	gsettings_wrapper set org.gnome.desktop.interface icon-theme Papirus
     else
         gsettings_wrapper set org.gnome.desktop.interface gtk-theme adw-gtk3
     fi
 }
 
 install_icons() {
-    wget https://deb.debian.org/debian/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_45.0-1_all.deb -O /tmp/adwaita-icon-theme.deb
-    apt install /tmp/adwaita-icon-theme.deb -y
+    apt install adwaita-icon-theme -y
 }
 
 restore_firefox() {
@@ -102,7 +100,7 @@ restore_firefox() {
 	Pin-Priority: -1
 	EOF
     apt update
-    apt install firefox -y
+    apt install firefox
 }
 
 ask_reboot() {
@@ -147,7 +145,7 @@ print_banner() {
 ▐ ▐ ▐ ▐ ▐ ▐ ▐ ▐  ▐  ▐ ▐  ▀▘ ▐ ▐ ▐▀▀ ▐ ▐ ▐ ▐  ▐   ▐   ▀▚ ▐ ▐  ▐   ▐   ▝  
 ▝▄▜ ▐▙▛ ▝▄▜ ▐ ▐  ▝▄ ▝▄▜     ▝▙█ ▝▙▞ ▐▙▛ ▝▄▜  ▝▄  ▝▄ ▝▄▞ ▐ ▐ ▗▟▄  ▝▄  ▐  
                                                                                                       
- By @polkaulfield
+ By @polkaulfield and @runa-chin
  '
 }
 
@@ -158,7 +156,7 @@ show_menu() {
     echo '3 - Remove app crash popup'
     echo '4 - Remove snaps and snapd'
     echo '5 - Disable terminal ads (LTS versions)'
-    echo '6 - Install flathub and gnome-software'
+    echo '6 - Install flathub and gnome-software (also with Pacstall)'
     echo '7 - Install firefox from PPA'
     echo '8 - Install vanilla GNOME session'
     echo '9 - Install adw-gtk3 and latest adwaita icons'
@@ -197,7 +195,7 @@ main() {
             ;;
         6)
             update_system
-            setup_flathub
+            setup_flathub_and_pacstall
             msg 'Done!'
             ask_reboot
             ;;
@@ -243,7 +241,7 @@ auto() {
     disable_terminal_ads
     msg 'Deleting everything snap related'
     remove_snaps
-    msg 'Setting up flathub'
+    msg 'Setting up flathub and Pacstall
     setup_flathub
     msg 'Restoring Firefox from mozilla PPA'
     restore_firefox
@@ -251,7 +249,7 @@ auto() {
     setup_vanilla_gnome
     msg 'Install adw-gtk3 and set dark theme'
     install_adwgtk3
-    msg 'Installing GNOME 43 icons'
+    msg 'Installing Latest Adwaita icons'
     install_icons
     msg 'Cleaning up'
     cleanup