diff --git a/.github/workflows/bashisms.yml b/.github/workflows/bashisms.yml
index 7ce39ef1..ffbe983b 100644
--- a/.github/workflows/bashisms.yml
+++ b/.github/workflows/bashisms.yml
@@ -3,7 +3,7 @@ name: Check for bashisms
 on:
   pull_request:
     paths:
-      - core/tabs/**
+      - 'core/tabs/**/*.sh'
   merge_group:
   workflow_dispatch:
 
@@ -15,31 +15,33 @@ jobs:
       - uses: actions/checkout@v4
       - run: git fetch origin ${{ github.base_ref }}
 
-      - name: Get a list of changed script files
-        id: get_sh_files
-        run: |
-          sh_files=$(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs | grep '\.sh$' || true)
-          if [ -n "$sh_files" ]; then
-            echo "$sh_files" > changed_files
-            echo "changed=1" >> $GITHUB_OUTPUT
-          else
-            echo "changed=0" >> $GITHUB_OUTPUT
-          fi
-      
       - name: Install devscripts
-        if: steps.get_sh_files.outputs.changed == 1
-        run: sudo apt-get update && sudo apt-get install devscripts
+        run: sudo apt-get update && sudo apt-get install -y devscripts
+
+      - name: Get changed .sh files (PR only)
+        id: changed-sh-files
+        if: github.event_name == 'pull_request'
+        uses: tj-actions/changed-files@v45
+        with:
+          files: '**/*.sh'
+
+      - name: Get all .sh files (if workflow dispatched)
+        id: sh-files
+        if: github.event_name != 'pull_request'
+        run: |
+          files=$(find . -type f -name "*.sh" | tr '\n' ' ')
+          echo "files=${files:-none}" >> $GITHUB_ENV
+
+      - name: Set FILES for bashism check
+        id: set-files
+        run: |
+          if [[ "${{ steps.changed-sh-files.outputs.any_changed }}" == 'true' ]]; then
+            echo "FILES=${{ steps.changed-sh-files.outputs.all_changed_files }}" >> $GITHUB_ENV
+          else
+            echo "FILES=${{ env.files }}" >> $GITHUB_ENV
+          fi
 
       - name: Check for bashisms
-        if: steps.get_sh_files.outputs.changed == 1
         run: |
-          echo "Running for:\n$(cat changed_files)\n"
-          for file in $(cat changed_files); do
-            if [[ -f "$file" ]]; then
-              checkbashisms "$file"
-            fi
-          done
-
-      - name: Remove the created file
-        if: steps.get_sh_files.outputs.changed == 1
-        run: rm changed_files
+          IFS=' ' read -r -a file_array <<< "$FILES"
+          checkbashisms "${file_array[@]}"
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
index 30e992d4..94ca5e3c 100644
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -13,6 +13,10 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment: linutil_env
+    permissions:
+      contents: write
+      pull-requests: write
 
     steps:
       - name: Checkout Repository
@@ -24,11 +28,17 @@ jobs:
         run: |
           echo -e "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
         with:
-          commit_message: Commit Contributing Guidelines
-          file_pattern: "docs/contributing.md"
-          add_options: '--force'
+          commit-message: Update Contributing Guidelines
+          title: 'docs: Update Contributing Guidelines'
+          body: 'Automated update of Contributing Guidelines from .github/CONTRIBUTING.md'
+          branch: update-contributing-guidelines
+          delete-branch: true
+          base: main
+          labels: documentation
+          token: ${{ secrets.PAT_TOKEN }}
         if: success()
 
       - name: Setup Python
diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml
index 53c43d02..187f1e54 100644
--- a/.github/workflows/linutil.yml
+++ b/.github/workflows/linutil.yml
@@ -46,19 +46,9 @@ jobs:
         run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl --all-features
 
       - name: Build aarch64 binary
-        run: cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl --all-features
-
-      - name: Move binaries to build directory
         run: |
-          mv build/x86_64-unknown-linux-musl/release/linutil build/linutil
-          mv build/aarch64-unknown-linux-musl/release/linutil build/linutil-aarch64
-
-      - uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: Commit Linutil
-          file_pattern: "build/linutil build/linutil-aarch64"
-          add_options: '--force'
-        if: success()
+          cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl --all-features
+          mv ./build/aarch64-unknown-linux-musl/release/linutil ./build/aarch64-unknown-linux-musl/release/linutil-aarch64
 
       - name: Extract Version
         id: extract_version
@@ -80,32 +70,11 @@ jobs:
           append_body: true
           generate_release_notes: true
           files: |
-            ./build/linutil
-            ./build/linutil-aarch64
+            ./build/x86_64-unknown-linux-musl/release/linutil
+            ./build/aarch64-unknown-linux-musl/release/linutil-aarch64
             ./start.sh
             ./startdev.sh
           prerelease: true
         env:
           version: ${{ env.version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup Preview
-        run: |
-          echo "$(pwd)/build" >> $GITHUB_PATH
-      
-      - name: Generate preview 
-        uses: charmbracelet/vhs-action@v2.1.0
-        with:
-          path: "docs/assets/preview.tape"
-
-      - name: Move preview
-        run: |
-          mv preview.gif docs/assets/preview.gif
-
-      - name: Upload preview
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: Preview for ${{ env.version }}
-          file_pattern: "docs/assets/preview.gif"
-          add_options: "--force"
-        if: success()
\ No newline at end of file
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
new file mode 100644
index 00000000..4967eeef
--- /dev/null
+++ b/.github/workflows/preview.yml
@@ -0,0 +1,78 @@
+name: LinUtil Preview
+
+on:
+  workflow_dispatch:
+    inputs:
+        tag_name:
+          description: 'Tag name'
+          required: true
+  workflow_run:
+    workflows: ["LinUtil Release"]
+    types:
+      - completed
+
+jobs:
+  generate_preview:
+    runs-on: ubuntu-latest
+    environment: linutil_env
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Get tag name ( Workflow Run )
+        id: latest_tag
+        uses: actions/github-script@v7
+        if: github.event_name == 'workflow_run'
+        with:
+          script: |
+            const releases = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 1
+            });
+            core.setOutput('result', releases.data[0].tag_name);
+          result-encoding: string
+
+      - name: Set tag name ( Workflow Run )
+        if: github.event_name == 'workflow_run'
+        run: echo "tag_name=${{ steps.latest_tag.outputs.result }}" >> $GITHUB_ENV
+
+      - name: Set tag name ( Workflow Dispatch )
+        if: ${{ github.event_name }} == 'workflow_dispatch'
+        run: echo "tag_name=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+
+      - name: Download binary
+        run: |
+          curl -LO "https://github.com/${{ github.repository }}/releases/download/${{ env.tag_name }}/linutil"
+
+      - name: Set env
+        run: |
+          chmod +x linutil
+          mkdir -p build
+          mv linutil build/linutil
+          echo "${{ github.workspace }}/build" >> $GITHUB_PATH
+
+      - name: Generate preview
+        uses: charmbracelet/vhs-action@v2.1.0
+        with:
+          path: "docs/assets/preview.tape"
+
+      - name: Move preview
+        run: mv preview.gif docs/assets/preview.gif
+
+      - name: Create PR
+        uses: peter-evans/create-pull-request@v7.0.5
+        with:
+          commit-message: Preview for ${{ env.tag_name }}
+          file-pattern: "docs/assets/preview.gif"
+          add-options: "--force"
+          token: ${{ secrets.PAT_TOKEN }}
+          branch: feature/preview-${{ env.tag_name }}
+          title: "Update preview for ${{ env.tag_name }}"
+          body: |
+            Automated PR to update preview gif for version ${{ env.tag_name }}
+        if: success()
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 854e9451..bfcc3bc8 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -17,6 +17,7 @@ jobs:
       - name: Run ShellCheck
         uses: reviewdog/action-shellcheck@v1
         with:
+          shellcheck_flags: '--source-path=${{ github.workspace }}/.shellcheckrc'
           reviewdog_flags: '-fail-level=any'
 
   shfmt:
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 901d5e71..864dfc3b 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -12,4 +12,4 @@ jobs:
       - run: git fetch origin ${{ github.base_ref }}
 
       - name: Run spellcheck
-        uses: crate-ci/typos@v1.25.0
+        uses: crate-ci/typos@v1.26.0
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 00000000..0b882066
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1,2 @@
+external-sources=true
+source=core/tabs/common-script.sh
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 25a5760b..e6f5151f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "ansi-to-tui"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c4af0bef1b514c9b6a32a773caf604c1390fa7913f4eaa23bfe76f251d6a42"
+checksum = "67555e1f1ece39d737e28c8a017721287753af3f93225e4a445b29ccb0f5912c"
 dependencies = [
  "nom",
  "ratatui",
@@ -159,9 +159,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.19"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.19"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -358,6 +358,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
 [[package]]
 name = "instability"
 version = "0.3.2"
@@ -661,23 +667,23 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
+checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
 dependencies = [
  "bitflags 2.6.0",
  "cassowary",
  "compact_str",
  "crossterm",
+ "indoc",
  "instability",
  "itertools",
  "lru",
  "paste",
  "strum",
- "strum_macros",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -1023,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.24.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b84f60031bf8245b563a80c92c1034e557a914f7958f474bc0afa2eed78b98"
+checksum = "f9871f16d6cf5c4757dcf30d5d2172a2df6987c510c017bbb7abfb7f9aa24d06"
 dependencies = [
  "cc",
  "regex",
@@ -1046,9 +1052,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-highlight"
-version = "0.24.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c727fb31f816c09fc54dc0e971d101318926866f7261b2acb820e84a61bf52d"
+checksum = "48859aa39513716018d81904220960f415dbb72e071234a721304d20bf245e4c"
 dependencies = [
  "lazy_static",
  "regex",
@@ -1065,9 +1071,9 @@ checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
 
 [[package]]
 name = "tui-term"
-version = "0.1.13"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07f0233f0d4795d2dc6663cfc3ce56b87bebcee66d6bcc088aa6aff5c072361"
+checksum = "72af159125ce32b02ceaced6cffae6394b0e6b6dfd4dc164a6c59a2db9b3c0b0"
 dependencies = [
  "ratatui",
  "vt100",
diff --git a/core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh b/core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh
new file mode 100644
index 00000000..79ce360e
--- /dev/null
+++ b/core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+manualInstall() {
+    JETBRAINS_TOOLBOX_DIR="/opt/jetbrains-toolbox"
+
+    case "$ARCH" in
+        x86_64) ARCHIVE_URL=$(curl -s "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release" | jq -r ".TBA[0].downloads.linux.link") ;;
+        aarch64) ARCHIVE_URL=$(curl -s "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release" | jq -r ".TBA[0].downloads.linuxARM64.link") ;;
+    esac
+
+    curl -fSL "$ARCHIVE_URL" -o "jetbrains-toolbox.tar.gz"
+
+    if [ -d "$JETBRAINS_TOOLBOX_DIR" ]; then
+        "$ESCALATION_TOOL" rm -rf "$JETBRAINS_TOOLBOX_DIR"
+    fi
+
+    "$ESCALATION_TOOL" mkdir -p "$JETBRAINS_TOOLBOX_DIR"
+    "$ESCALATION_TOOL" tar -xzf "jetbrains-toolbox.tar.gz" -C "$JETBRAINS_TOOLBOX_DIR" --strip-components=1
+    "$ESCALATION_TOOL" ln -sf "$JETBRAINS_TOOLBOX_DIR/jetbrains-toolbox" "/usr/bin/jetbrains-toolbox"
+}
+
+installJetBrainsToolBox() {
+    if ! command_exists jetbrains-toolbox; then
+        printf "%b\n" "${YELLOW}Installing Jetbrains Toolbox...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm jetbrains-toolbox
+                ;;
+            dnf)
+                manualInstall
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y libfuse2
+                manualInstall
+                ;;
+        esac
+        printf "%b\n" "${GREEN}Successfully installed Jetbrains Toolbox.${RC}"
+    else
+        printf "%b\n" "${GREEN}Jetbrains toolbox is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installJetBrainsToolBox
diff --git a/core/tabs/applications-setup/Developer-tools/meld-setup.sh b/core/tabs/applications-setup/Developer-tools/meld-setup.sh
index bd0bb3c2..031a09ae 100644
--- a/core/tabs/applications-setup/Developer-tools/meld-setup.sh
+++ b/core/tabs/applications-setup/Developer-tools/meld-setup.sh
@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installMeld() {
-    if ! command_exists meld; then
+    if ! command_exists org.gnome.meld && ! command_exists meld; then
         printf "%b\n" "${YELLOW}Installing Meld...${RC}"
         case "$PACKAGER" in
             pacman)
@@ -13,7 +13,7 @@ installMeld() {
                 "$ESCALATION_TOOL" "$PACKAGER" -y install meld
                 ;;
             *)
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.gnome.meld
                 ;;
         esac
diff --git a/core/tabs/applications-setup/bottles-setup.sh b/core/tabs/applications-setup/bottles-setup.sh
index 02fef60b..0b29bedb 100755
--- a/core/tabs/applications-setup/bottles-setup.sh
+++ b/core/tabs/applications-setup/bottles-setup.sh
@@ -3,14 +3,9 @@
 . ../common-script.sh
 
 installBottles() {
-    if ! command_exists flatpak; then
-    printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
-        case "$PACKAGER" in
-            *)
-                . ./setup-flatpak.sh
-                flatpak install -y flathub com.usebottles.bottles
-                ;;
-        esac
+    if ! command_exists com.usebottles.bottles; then
+        printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
+        flatpak install -y flathub com.usebottles.bottles
     else
         printf "%b\n" "${GREEN}Bottles is already installed.${RC}"
     fi
@@ -18,4 +13,5 @@ installBottles() {
 
 checkEnv
 checkEscalationTool
+checkFlatpak
 installBottles
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/vivaldi.sh b/core/tabs/applications-setup/browsers/vivaldi.sh
index 002ff7e3..311816d0 100644
--- a/core/tabs/applications-setup/browsers/vivaldi.sh
+++ b/core/tabs/applications-setup/browsers/vivaldi.sh
@@ -2,22 +2,39 @@
 
 . ../../common-script.sh
 
-installLynx() {
-    if ! command_exists lynx; then
-        printf "%b\n" "${YELLOW}Installing Lynx...${RC}"
+installVivaldi() {
+    if ! command_exists vivaldi; then
+        printf "%b\n" "${YELLOW}Installing Vivaldi...${RC}"
         case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y curl
+                "$ESCALATION_TOOL" curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | sudo dd of=/usr/share/keyrings/vivaldi-browser.gpg
+                "$ESCALATION_TOOL" echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" | sudo dd of=/etc/apt/sources.list.d/vivaldi-archive.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
+                "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://repo.vivaldi.com/stable/vivaldi-fedora.repo
+                "$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" zypper ar https://repo.vivaldi.com/archive/vivaldi-suse.repo
+                "$ESCALATION_TOOL" zypper --non-interactive --gpg-auto-import-keys in vivaldi-stable
+                ;;
             pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm vivaldi
                 ;;
             *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
                 ;;
         esac
     else
-        printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}"
+        printf "%b\n" "${GREEN}Vivaldi Browser is already installed.${RC}"
     fi
 }
 
 checkEnv
 checkEscalationTool
-installLynx
\ No newline at end of file
+installVivaldi
diff --git a/core/tabs/applications-setup/communication-apps/signal-setup.sh b/core/tabs/applications-setup/communication-apps/signal-setup.sh
index 7f5d70fc..cdd71b55 100644
--- a/core/tabs/applications-setup/communication-apps/signal-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/signal-setup.sh
@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installSignal() {
-    if ! command_exists signal; then
+    if ! command_exists org.signal.Signal && ! command_exists signal; then
         printf "%b\n" "${YELLOW}Installing Signal...${RC}"
         case "$PACKAGER" in
             apt-get|nala)
@@ -20,8 +20,8 @@ installSignal() {
                 "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm signal-desktop
                 ;;
             dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" copr enable luminoso/Signal-Desktop
-                "$ESCALATION_TOOL" "$PACKAGER" install -y signal-desktop 
+                checkFlatpak
+                flatpak install -y flathub org.signal.Signal
                 ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
diff --git a/core/tabs/applications-setup/communication-apps/slack-setup.sh b/core/tabs/applications-setup/communication-apps/slack-setup.sh
index e4bf3719..24d6e532 100644
--- a/core/tabs/applications-setup/communication-apps/slack-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/slack-setup.sh
@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installSlack() {
-    if ! command_exists slack; then
+    if ! command_exists com.slack.Slack && ! command_exists slack; then
         printf "%b\n" "${YELLOW}Installing Slack...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm slack-desktop
                 ;;
             *)  
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub com.slack.Slack
                 ;;
         esac
diff --git a/core/tabs/applications-setup/communication-apps/zoom-setup.sh b/core/tabs/applications-setup/communication-apps/zoom-setup.sh
index acd5b180..19d7e407 100644
--- a/core/tabs/applications-setup/communication-apps/zoom-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/zoom-setup.sh
@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installZoom() {
-    if ! command_exists zoom; then
+    if ! command_exists us.zoom.Zoom && ! command_exists zoom; then
         printf "%b\n" "${YELLOW}Installing Zoom...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm zoom
                 ;;
             *)
-                . ../setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub us.zoom.Zoom
                 ;;
         esac
diff --git a/core/tabs/applications-setup/docker-setup.sh b/core/tabs/applications-setup/docker-setup.sh
index afcd1572..4844d10e 100755
--- a/core/tabs/applications-setup/docker-setup.sh
+++ b/core/tabs/applications-setup/docker-setup.sh
@@ -26,6 +26,12 @@ install_docker() {
         apt-get|nala)
             curl -fsSL https://get.docker.com | sh 
             ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
+            "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+            "$ESCALATION_TOOL" "$PACKAGER" -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
+            "$ESCALATION_TOOL" systemctl enable --now docker
+            ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker
             "$ESCALATION_TOOL" systemctl enable docker
@@ -49,6 +55,11 @@ install_docker_compose() {
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin
             ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
+            "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+            "$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin
+            ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install docker-compose
             ;;
diff --git a/core/tabs/applications-setup/office-suites/libreoffice.sh b/core/tabs/applications-setup/office-suites/libreoffice.sh
index 165730c1..f389abd8 100644
--- a/core/tabs/applications-setup/office-suites/libreoffice.sh
+++ b/core/tabs/applications-setup/office-suites/libreoffice.sh
@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installLibreOffice() {
-    if ! command_exists libreoffice; then
+    if ! command_exists org.libreoffice.LibreOffice && ! command_exists libreoffice; then
         printf "%b\n" "${YELLOW}Installing Libre Office...${RC}"
         case "$PACKAGER" in
             apt-get|nala)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y libreoffice-core
                 ;;
             zypper|dnf)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.libreoffice.LibreOffice
                 ;;
             pacman)
diff --git a/core/tabs/applications-setup/office-suites/onlyoffice.sh b/core/tabs/applications-setup/office-suites/onlyoffice.sh
index 9e80fd31..f6fb97f6 100644
--- a/core/tabs/applications-setup/office-suites/onlyoffice.sh
+++ b/core/tabs/applications-setup/office-suites/onlyoffice.sh
@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installOnlyOffice() {
-    if ! command_exists onlyoffice-desktopeditors; then
+    if ! command_exists org.onlyoffice.desktopeditors && ! command_exists onlyoffice-desktopeditors; then
         printf "%b\n" "${YELLOW}Installing Only Office..${RC}."
         case "$PACKAGER" in
             apt-get|nala)
@@ -11,7 +11,7 @@ installOnlyOffice() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y ./onlyoffice-desktopeditors_amd64.deb
                 ;;
             zypper|dnf)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install -y flathub org.onlyoffice.desktopeditors
                 ;;
             pacman)
diff --git a/core/tabs/applications-setup/office-suites/wpsoffice.sh b/core/tabs/applications-setup/office-suites/wpsoffice.sh
index 5e75e800..4ce1f5c5 100644
--- a/core/tabs/applications-setup/office-suites/wpsoffice.sh
+++ b/core/tabs/applications-setup/office-suites/wpsoffice.sh
@@ -3,14 +3,14 @@
 . ../../common-script.sh
 
 installWpsOffice() {
-    if ! command_exists com.wps.Office; then
+    if ! command_exists com.wps.Office && ! command_exists wps; then
         printf "%b\n" "${YELLOW}Installing WPS Office...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm wps-office
                 ;;
             *)
-                . ./setup-flatpak.sh
+                checkFlatpak
                 flatpak install flathub com.wps.Office
                 ;;
         esac
diff --git a/core/tabs/applications-setup/setup-flatpak.sh b/core/tabs/applications-setup/setup-flatpak.sh
index 75da28af..379467a6 100755
--- a/core/tabs/applications-setup/setup-flatpak.sh
+++ b/core/tabs/applications-setup/setup-flatpak.sh
@@ -2,9 +2,7 @@
 
 . ../common-script.sh
 
-# Used to detect the desktop environment, Only used for the If statement in the setup_flatpak function.
-# Perhaps this should be moved to common-script.sh later on?
-detect_de() {
+checkDE() {
     if [ -n "$XDG_CURRENT_DESKTOP" ]; then
         case "$XDG_CURRENT_DESKTOP" in
             *GNOME*)
@@ -17,42 +15,11 @@ detect_de() {
     fi
 }
 
-# Install Flatpak if not already installed.
-setup_flatpak() {
-    if ! command_exists flatpak; then
-    printf "%b\n" "${YELLOW}Installing Flatpak...${RC}"
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm flatpak
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y flatpak
-                ;;
-        esac
-        printf "%b\n" "Adding Flathub remote..."
-        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    else
-        if command_exists flatpak; then
-            if ! flatpak remotes | grep -q "flathub"; then
-                printf "%b" "${YELLOW}Detected Flatpak package manager but Flathub remote is not added. Would you like to add it? (y/N): ${RC}"
-                read -r add_remote
-                case "$add_remote" in
-                    [Yy]*)
-                        printf "%b\n" "Adding Flathub remote..."
-                        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-                        ;;
-                esac
-            else
-                # Needed mostly for systems without a polkit agent running (Error: updating: Unable to connect to system bus)
-                printf "%b\n" "${GREEN}Flathub already setup. You can quit.${RC}"
-            fi
-        fi
-    fi
-
+installExtra() {
     if [ "$PACKAGER" = "apt-get" ] || [ "$PACKAGER" = "nala" ]; then
-        detect_de
+        checkDE
         # Only used for Ubuntu GNOME. Ubuntu GNOME doesnt allow flathub to be added as a remote to their store.
-        # So in case the user wants to use a GUI siftware manager they can setup it here
+        # So in case the user wants to use a GUI software manager they can setup it here
         if [ "$DE" = "GNOME" ]; then
             printf "%b" "${YELLOW}Detected GNOME desktop environment. Would you like to install GNOME Software plugin for Flatpak? (y/N): ${RC}"
             read -r install_gnome
@@ -72,4 +39,5 @@ setup_flatpak() {
 
 checkEnv
 checkEscalationTool
-setup_flatpak
+checkFlatpak
+installExtra
\ No newline at end of file
diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
index c2eed43f..dce7fa79 100644
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@@ -54,6 +54,12 @@ description = "GitHub Desktop is a user-friendly application that simplifies the
 script = "Developer-tools/githubdesktop-setup.sh"
 task_list = "I"
 
+[[data.entries]]
+name = "JetBrains Toolbox"
+description = "JetBrains Toolbox is a collection of tools and an app that help developers work with JetBrains products."
+script = "Developer-tools/jetbrains-toolbox.sh"
+task_list = "I"
+
 [[data.entries]]
 name = "Meld"
 description = "Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects."
diff --git a/core/tabs/common-script.sh b/core/tabs/common-script.sh
index 396f358d..a9dd5d62 100644
--- a/core/tabs/common-script.sh
+++ b/core/tabs/common-script.sh
@@ -9,10 +9,48 @@ CYAN='\033[36m'
 GREEN='\033[32m'
 
 command_exists() {
-    for cmd in "$@"; do
-        command -v "$cmd" >/dev/null 2>&1 || return 1
-    done
-    return 0
+for cmd in "$@"; do
+    export PATH=/home/jeeva/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:$PATH
+    command -v "$cmd" >/dev/null 2>&1 || return 1
+done
+return 0
+}
+
+checkFlatpak() {
+    if ! command_exists flatpak; then
+        printf "%b\n" "${YELLOW}Installing Flatpak...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm flatpak
+                ;;
+            apk)
+                "$ESCALATION_TOOL" "$PACKAGER" add flatpak
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y flatpak
+                ;;
+        esac
+        printf "%b\n" "${YELLOW}Adding Flathub remote...${RC}"
+        "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        printf "%b\n" "${YELLOW}Applications installed by Flatpak may not appear on your desktop until the user session is restarted...${RC}"
+    else
+        if ! flatpak remotes | grep -q "flathub"; then
+            printf "%b\n" "${YELLOW}Adding Flathub remote...${RC}"
+            "$ESCALATION_TOOL" flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        else
+            printf "%b\n" "${CYAN}Flatpak is installed${RC}"
+        fi
+    fi
+}
+
+checkArch() {
+    case "$(uname -m)" in
+        x86_64 | amd64) ARCH="x86_64" ;;
+        aarch64 | arm64) ARCH="aarch64" ;;
+        *) printf "%b\n" "${RED}Unsupported architecture: $(uname -m)${RC}" && exit 1 ;;
+    esac
+
+    printf "%b\n" "${CYAN}System architecture: ${ARCH}${RC}"
 }
 
 checkAURHelper() {
@@ -128,6 +166,7 @@ checkDistro() {
 }
 
 checkEnv() {
+    checkArch
     checkEscalationTool
     checkCommandRequirements "curl groups $ESCALATION_TOOL"
     checkPackageManager 'nala apt-get dnf pacman zypper'
diff --git a/core/tabs/system-setup/arch/server-setup.sh b/core/tabs/system-setup/arch/server-setup.sh
index 3a385df5..913d5f61 100755
--- a/core/tabs/system-setup/arch/server-setup.sh
+++ b/core/tabs/system-setup/arch/server-setup.sh
@@ -130,7 +130,7 @@ echo -ne "
 ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
 ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
 ------------------------------------------------------------------------
-            Please select presetup settings for your system              
+            Please select presetup settings for your system
 ------------------------------------------------------------------------
 "
 }
@@ -146,7 +146,7 @@ filesystem () {
     case $? in
     0) export FS=btrfs;;
     1) export FS=ext4;;
-    2) 
+    2)
         set_password "LUKS_PASSWORD"
         export FS=luks
         ;;
@@ -155,14 +155,14 @@ filesystem () {
     esac
 }
 
-# @description Detects and sets timezone. 
+# @description Detects and sets timezone.
 timezone () {
     # Added this from arch wiki https://wiki.archlinux.org/title/System_time
     time_zone="$(curl --fail https://ipapi.co/timezone)"
     echo -ne "
     System detected your timezone to be '$time_zone' \n"
     echo -ne "Is this correct?
-    " 
+    "
     options=("Yes" "No")
     select_option "${options[@]}"
 
@@ -171,14 +171,14 @@ timezone () {
         echo "${time_zone} set as timezone"
         export TIMEZONE=$time_zone;;
         n|N|no|NO|No)
-        echo "Please enter your desired timezone e.g. Europe/London :" 
+        echo "Please enter your desired timezone e.g. Europe/London :"
         read -r new_timezone
         echo "${new_timezone} set as timezone"
         export TIMEZONE=$new_timezone;;
         *) echo "Wrong option. Try again";timezone;;
     esac
 }
-# @description Set user's keyboard mapping. 
+# @description Set user's keyboard mapping.
 keymap () {
     echo -ne "
     Please select key board layout from this list"
@@ -236,18 +236,18 @@ echo -ne "
     drivessd
 }
 
-# @description Gather username and password to be used for installation. 
+# @description Gather username and password to be used for installation.
 userinfo () {
     # Loop through user input until the user gives a valid username
     while true
-    do 
+    do
             read -r -p "Please enter username: " username
             if [[ "${username,,}" =~ ^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\$)$ ]]
-            then 
+            then
                     break
-            fi 
+            fi
             echo "Incorrect username."
-    done 
+    done
     export USERNAME=$username
 
     while true
@@ -264,22 +264,22 @@ userinfo () {
     done
     export PASSWORD=$PASSWORD1
 
-     # Loop through user input until the user gives a valid hostname, but allow the user to force save 
+     # Loop through user input until the user gives a valid hostname, but allow the user to force save
     while true
-    do 
+    do
             read -r -p "Please name your machine: " name_of_machine
             # hostname regex (!!couldn't find spec for computer name!!)
             if [[ "${name_of_machine,,}" =~ ^[a-z][a-z0-9_.-]{0,62}[a-z0-9]$ ]]
-            then 
-                    break 
-            fi 
+            then
+                    break
+            fi
             # if validation fails allow the user to force saving of the hostname
-            read -r -p "Hostname doesn't seem correct. Do you still want to save it? (y/n)" force 
+            read -r -p "Hostname doesn't seem correct. Do you still want to save it? (y/n)" force
             if [[ "${force,,}" = "y" ]]
-            then 
-                    break 
-            fi 
-    done 
+            then
+                    break
+            fi
+    done
     export NAME_OF_MACHINE=$name_of_machine
 }
 
@@ -351,7 +351,7 @@ echo -ne "
                     Creating Filesystems
 -------------------------------------------------------------------------
 "
-# @description Creates the btrfs subvolumes. 
+# @description Creates the btrfs subvolumes.
 createsubvolumes () {
     btrfs subvolume create /mnt/@
     btrfs subvolume create /mnt/@home
@@ -362,11 +362,11 @@ mountallsubvol () {
     mount -o "${MOUNT_OPTIONS}",subvol=@home "${partition3}" /mnt/home
 }
 
-# @description BTRFS subvolulme creation and mounting. 
+# @description BTRFS subvolulme creation and mounting.
 subvolumesetup () {
 # create nonroot subvolumes
-    createsubvolumes     
-# unmount root to remount with subvolume 
+    createsubvolumes
+# unmount root to remount with subvolume
     umount /mnt
 # mount @ subvolume
     mount -o "${MOUNT_OPTIONS}",subvol=@ "${partition3}" /mnt
@@ -386,33 +386,36 @@ fi
 
 if [[ "${FS}" == "btrfs" ]]; then
     mkfs.vfat -F32 -n "EFIBOOT" "${partition2}"
-    mkfs.btrfs -L ROOT "${partition3}" -f
+    mkfs.btrfs -f "${partition3}"
     mount -t btrfs "${partition3}" /mnt
     subvolumesetup
 elif [[ "${FS}" == "ext4" ]]; then
     mkfs.vfat -F32 -n "EFIBOOT" "${partition2}"
-    mkfs.ext4 -L ROOT "${partition3}"
+    mkfs.ext4 "${partition3}"
     mount -t ext4 "${partition3}" /mnt
 elif [[ "${FS}" == "luks" ]]; then
-    mkfs.vfat -F32 -n "EFIBOOT" "${partition2}"
+    mkfs.vfat -F32 "${partition2}"
 # enter luks password to cryptsetup and format root partition
     echo -n "${LUKS_PASSWORD}" | cryptsetup -y -v luksFormat "${partition3}" -
-# open luks container and ROOT will be place holder 
+# open luks container and ROOT will be place holder
     echo -n "${LUKS_PASSWORD}" | cryptsetup open "${partition3}" ROOT -
 # now format that container
-    mkfs.btrfs -L ROOT "${partition3}"
+    mkfs.btrfs "${partition3}"
 # create subvolumes for btrfs
     mount -t btrfs "${partition3}" /mnt
     subvolumesetup
+    ENCRYPTED_PARTITION_UUID=$(blkid -s UUID -o value "${partition3}")
 fi
 
+BOOT_UUID=$(blkid -s UUID -o value "${partition2}")
+
 sync
 if ! mountpoint -q /mnt; then
     echo "ERROR! Failed to mount ${partition3} to /mnt after multiple attempts."
     exit 1
 fi
 mkdir -p /mnt/boot/efi
-mount -t vfat -L EFIBOOT /mnt/boot/
+mount -t vfat -U "${BOOT_UUID}" /mnt/boot/
 
 if ! grep -qs '/mnt' /proc/mounts; then
     echo "Drive is not mounted can not continue"
@@ -435,8 +438,8 @@ fi
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 
-genfstab -L /mnt >> /mnt/etc/fstab
-echo " 
+genfstab -U /mnt >> /mnt/etc/fstab
+echo "
   Generated /etc/fstab:
 "
 cat /mnt/etc/fstab
@@ -475,14 +478,14 @@ arch-chroot /mnt /bin/bash -c "KEYMAP='${KEYMAP}' /bin/bash" <<EOF
 
 echo -ne "
 -------------------------------------------------------------------------
-                    Network Setup 
+                    Network Setup
 -------------------------------------------------------------------------
 "
 pacman -S --noconfirm --needed networkmanager dhclient
 systemctl enable --now NetworkManager
 echo -ne "
 -------------------------------------------------------------------------
-                    Setting up mirrors for optimal download 
+                    Setting up mirrors for optimal download
 -------------------------------------------------------------------------
 "
 pacman -S --noconfirm --needed pacman-contrib curl
@@ -504,7 +507,7 @@ sed -i "s/COMPRESSXZ=(xz -c -z -)/COMPRESSXZ=(xz -c -T $nc -z -)/g" /etc/makepkg
 fi
 echo -ne "
 -------------------------------------------------------------------------
-                    Setup Language to US and set locale  
+                    Setup Language to US and set locale
 -------------------------------------------------------------------------
 "
 sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
@@ -526,6 +529,9 @@ sed -i 's/^# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD: A
 #Add parallel downloading
 sed -i 's/^#ParallelDownloads/ParallelDownloads/' /etc/pacman.conf
 
+#Set colors and enable the easter egg
+sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf
+
 #Enable multilib
 sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf
 pacman -Sy --noconfirm --needed
@@ -572,7 +578,7 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 groupadd libvirt
-useradd -m -G wheel,libvirt -s /bin/bash $USERNAME 
+useradd -m -G wheel,libvirt -s /bin/bash $USERNAME
 echo "$USERNAME created, home directory created, added to wheel and libvirt group, default shell set to /bin/bash"
 echo "$USERNAME:$PASSWORD" | chpasswd
 echo "$USERNAME password set"
diff --git a/core/tabs/utils/encrypt_decrypt_tool.sh b/core/tabs/utils/encrypt_decrypt_tool.sh
index 0db4a49b..46fead9d 100644
--- a/core/tabs/utils/encrypt_decrypt_tool.sh
+++ b/core/tabs/utils/encrypt_decrypt_tool.sh
@@ -8,7 +8,7 @@ printf "%b\n" "${YELLOW}Ensuring OpenSSL is installed...${RC}"
 if ! command_exists openssl; then
     case "$PACKAGER" in
         pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm openssl
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed openssl
             ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y openssl
diff --git a/docs/assets/preview.gif b/docs/assets/preview.gif
index c8e49da1..77091ac4 100644
Binary files a/docs/assets/preview.gif and b/docs/assets/preview.gif differ
diff --git a/docs/userguide.md b/docs/userguide.md
index e406993c..e3f50c81 100644
--- a/docs/userguide.md
+++ b/docs/userguide.md
@@ -17,6 +17,7 @@
 ### Developer Tools
 
 - **Github Desktop**: GitHub Desktop is a user-friendly application that simplifies the process of managing Git repositories and interacting with GitHub, providing a graphical interface for tasks like committing, branching, and syncing changes.
+- **JetBrains Toolbox**: JetBrains Toolbox is a collection of tools and an app that help developers work with JetBrains products.
 - **Meld**: Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects.
 - **Neovim**: Neovim is a refactor, and sometimes redactor, in the tradition of Vim.
 It is not a rewrite but a continuation and extension of Vim.
diff --git a/tui/Cargo.toml b/tui/Cargo.toml
index 527ae7e3..b411fb2d 100644
--- a/tui/Cargo.toml
+++ b/tui/Cargo.toml
@@ -14,22 +14,22 @@ default = ["tips"]
 tips = ["rand"]
 
 [dependencies]
-clap = { version = "4.5.19", features = ["derive"] }
+clap = { version = "4.5.20", features = ["derive"] }
 crossterm = "0.28.1"
 ego-tree = { workspace = true }
 oneshot = "0.1.8"
 portable-pty = "0.8.1"
-ratatui = "0.28.1"
-tui-term = "0.1.12"
+ratatui = "0.29.0"
+tui-term = "0.2.0"
 temp-dir = "0.1.14"
 unicode-width = "0.2.0"
 rand = { version = "0.8.5", optional = true }
 linutil_core = { path = "../core", version = "24.9.28" }
-tree-sitter-highlight = "0.24.2"
+tree-sitter-highlight = "0.24.3"
 tree-sitter-bash = "0.23.1"
 textwrap = "0.16.1"
 anstyle = "1.0.8"
-ansi-to-tui = "6.0.0"
+ansi-to-tui = "7.0.0"
 zips = "0.1.7"
 
 [[bin]]
diff --git a/tui/src/filter.rs b/tui/src/filter.rs
index cd6063fc..898fee74 100644
--- a/tui/src/filter.rs
+++ b/tui/src/filter.rs
@@ -4,7 +4,7 @@ use ego_tree::NodeId;
 use linutil_core::Tab;
 use ratatui::{
     layout::{Position, Rect},
-    style::Style,
+    style::{Color, Style},
     text::Span,
     widgets::{Block, Borders, Paragraph},
     Frame,
@@ -22,6 +22,7 @@ pub struct Filter {
     in_search_mode: bool,
     input_position: usize,
     items: Vec<ListEntry>,
+    completion_preview: Option<String>,
 }
 
 impl Filter {
@@ -31,17 +32,23 @@ impl Filter {
             in_search_mode: false,
             input_position: 0,
             items: vec![],
+            completion_preview: None,
         }
     }
+
     pub fn item_list(&self) -> &[ListEntry] {
         &self.items
     }
+
     pub fn activate_search(&mut self) {
         self.in_search_mode = true;
     }
+
     pub fn deactivate_search(&mut self) {
         self.in_search_mode = false;
+        self.completion_preview = None;
     }
+
     pub fn update_items(&mut self, tabs: &[Tab], current_tab: usize, node: NodeId) {
         if self.search_input.is_empty() {
             let curr = tabs[current_tab].tree.get(node).unwrap();
@@ -78,13 +85,34 @@ impl Filter {
             }
             self.items.sort_by(|a, b| a.node.name.cmp(&b.node.name));
         }
+
+        self.update_completion_preview();
     }
+
+    fn update_completion_preview(&mut self) {
+        if self.search_input.is_empty() {
+            self.completion_preview = None;
+            return;
+        }
+
+        let input = self.search_input.iter().collect::<String>().to_lowercase();
+        self.completion_preview = self.items.iter().find_map(|item| {
+            let item_name_lower = item.node.name.to_lowercase();
+            if item_name_lower.starts_with(&input) {
+                Some(item_name_lower[input.len()..].to_string())
+            } else {
+                None
+            }
+        });
+    }
+
     pub fn draw_searchbar(&self, frame: &mut Frame, area: Rect, theme: &Theme) {
         //Set the search bar text (If empty use the placeholder)
         let display_text = if !self.in_search_mode && self.search_input.is_empty() {
             Span::raw("Press / to search")
         } else {
-            Span::raw(self.search_input.iter().collect::<String>())
+            let input_text = self.search_input.iter().collect::<String>();
+            Span::styled(input_text, Style::default().fg(theme.focused_color()))
         };
 
         let search_color = if self.in_search_mode {
@@ -110,11 +138,22 @@ impl Filter {
             let x = area.x + cursor_position as u16 + 1;
             let y = area.y + 1;
             frame.set_cursor_position(Position::new(x, y));
+
+            if let Some(preview) = &self.completion_preview {
+                let preview_span = Span::styled(preview, Style::default().fg(Color::DarkGray));
+                let preview_paragraph = Paragraph::new(preview_span).style(Style::default());
+                let preview_area = Rect::new(
+                    x,
+                    y,
+                    (preview.len() as u16).min(area.width - cursor_position as u16 - 1),
+                    1,
+                );
+                frame.render_widget(preview_paragraph, preview_area);
+            }
         }
     }
     // Handles key events. Returns true if search must be exited
     pub fn handle_key(&mut self, event: &KeyEvent) -> SearchAction {
-        //Insert user input into the search bar
         match event.code {
             KeyCode::Char('c') if event.modifiers.contains(KeyModifiers::CONTROL) => {
                 return self.exit_search()
@@ -124,10 +163,17 @@ impl Filter {
             KeyCode::Delete => self.remove_next(),
             KeyCode::Left => return self.cursor_left(),
             KeyCode::Right => return self.cursor_right(),
+            KeyCode::Tab => return self.complete_search(),
+            KeyCode::Esc => {
+                self.input_position = 0;
+                self.search_input.clear();
+                self.completion_preview = None;
+                return SearchAction::Exit;
+            }
             KeyCode::Enter => return SearchAction::Exit,
-            KeyCode::Esc => return self.exit_search(),
             _ => return SearchAction::None,
         };
+        self.update_completion_preview();
         SearchAction::Update
     }
 
@@ -141,16 +187,19 @@ impl Filter {
         self.input_position = self.input_position.saturating_sub(1);
         SearchAction::None
     }
+
     fn cursor_right(&mut self) -> SearchAction {
         if self.input_position < self.search_input.len() {
             self.input_position += 1;
         }
         SearchAction::None
     }
+
     fn insert_char(&mut self, input: char) {
         self.search_input.insert(self.input_position, input);
         self.cursor_right();
     }
+
     fn remove_previous(&mut self) {
         let current = self.input_position;
         if current > 0 {
@@ -158,12 +207,25 @@ impl Filter {
             self.cursor_left();
         }
     }
+
     fn remove_next(&mut self) {
         let current = self.input_position;
         if current < self.search_input.len() {
             self.search_input.remove(current);
         }
     }
+
+    fn complete_search(&mut self) -> SearchAction {
+        if let Some(completion) = self.completion_preview.take() {
+            self.search_input.extend(completion.chars());
+            self.input_position = self.search_input.len();
+            self.update_completion_preview();
+            SearchAction::Update
+        } else {
+            SearchAction::None
+        }
+    }
+
     pub fn clear_search(&mut self) {
         self.search_input.clear();
         self.input_position = 0;