2024-11-22 13:22:28 +00:00
115 changed files with 1048 additions and 2324 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -16,7 +16,6 @@ cd linutil
   ```

 ## 3. Make your changes
-
 - **Edit the files you want to change**: Make your changes to the relevant files.
 - **Test your changes**: Run `cargo run` to test your modifications in a local environment and ensure everything works as expected.

@ -61,7 +60,6 @@ cd linutil
 ## 11. Documentation

 - **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
- **Automatic generation**: If you decide to add functionality through a new shell script, make sure to fill out all fields in `tab_data.toml` and run `cargo xtask docgen`.

 ## 12. License

--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -2,20 +2,13 @@

 ## Supported Versions

-It is recommended that you use the stable branch as it's tested and used by most. The dev branch may contain bleeding-edge commits that are not well tested and are not meant to be used in production environments.<br>
-Version tags lower than the [latest stable release](https://github.com/ChrisTitusTech/linutil/releases/latest) are **not** supported.
+It is recommended that you run the stable version as this is more tested and used by most. The dev branch is bleed-edge commits that are not well tested and aren't meant to be used in production environments

-| Branch  | Supported              |
-| ------- | ---------------------- |
-| Stable  | :white_check_mark: YES |
-| Dev     | :x:                 NO |
-
-| Version                                            | Supported              |
-| -------------------------------------------------- | ---------------------- |
-| [![LATEST](https://img.shields.io/github/v/release/ChrisTitusTech/linutil?color=%230567ff&label=Latest&style=for-the-badge)](https://github.com/ChrisTitusTech/linutil/releases/latest) | :white_check_mark: YES |
-| Below LATEST                                       | :x:                 NO |
-| Above LATEST                                       | :x:                 NO |
+| Version | Supported          |
+| ------- | ------------------ |
+| latest  | :white_check_mark: |
+| dev     | :x:                |

 ## Reporting a Vulnerability

-If you have any reason to believe there are security vulnerabilities in Linutil, fill out the [report form](https://github.com/christitustech/linutil/security/advisories/new) or e-mail [contact@christitus.com](mailto:contact@christitus.com).
+I'd recommend making an Issue for reporting a bug. If you would like privately submit the bug you can email me at contact@christitus.com
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -7,4 +7,11 @@ updates:
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
-      interval: "weekly"
+      interval: "weekly"
+ignore:
+  - dependency-name: "actions/stale"
+    versions: '>= 9'
+  - dependency-name: "actions/setup-python"
+    versions: '> 4'
+  - dependency-name: "crossterm"
+    versions: '> 0.27.0'
--- a/.github/release.yml
+++ b/.github/release.yml
@ -2,34 +2,19 @@ changelog:
  categories:
    - title: '🚀 Features'
      labels:
+        - 'feature'
        - 'enhancement'
    - title: '🐛 Bug Fixes'
      labels:
+        - 'fix'
+        - 'bugfix'
        - 'bug'
-    - title: '⚙️ Refactoring'
-      labels:
-        - 'refactor'
-    - title: '🧩 UI/UX'
-      labels:
-        - 'UI/UX'
    - title: '📚 Documentation'
-      labels:
-        - 'documentation'
+      label: 'documentation'
    - title: '🔒 Security'
-      labels:
-        - 'security'
+      label: 'security'
    - title: '🧰 GitHub Actions'
-      labels:
-        - 'github_actions'
-    - title: '🦀 Rust'
-      labels:
-        - 'rust'
-    - title: '📃 Scripting'
-      labels:
-        - 'script'
-    - title: 'Other Changes'
-      labels:
-        - "*"
+      label: 'github actions'
  exclude:
    labels:
-      - 'skip-changelog'
+      - 'skip-changelog'
--- a/.github/workflows/bashisms.yml
+++ b/.github/workflows/bashisms.yml
@ -3,7 +3,7 @@ name: Check for bashisms
 on:
  pull_request:
    paths:
-      - 'core/tabs/**/*.sh'
+      - core/tabs/**
  merge_group:
  workflow_dispatch:

@ -15,33 +15,31 @@ jobs:
      - uses: actions/checkout@v4
      - run: git fetch origin ${{ github.base_ref }}

-      - name: 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'
+      - name: Get a list of changed script files
+        id: get_sh_files
        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
+          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 "FILES=${{ env.files }}" >> $GITHUB_ENV
+            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

      - name: Check for bashisms
+        if: steps.get_sh_files.outputs.changed == 1
        run: |
-          IFS=' ' read -r -a file_array <<< "$FILES"
-          checkbashisms "${file_array[@]}"
+          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
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@ -13,10 +13,6 @@ on:
 jobs:
  build-and-deploy:
    runs-on: ubuntu-latest
-    environment: linutil_env
-    permissions:
-      contents: write
-      pull-requests: write

    steps:
      - name: Checkout Repository
@ -26,19 +22,13 @@ jobs:

      - name: Copy Contributing Guidelines
        run: |
-          echo -e "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'
+          echo "<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n$(cat .github/CONTRIBUTING.md)" > 'docs/contributing.md'

-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+      - uses: stefanzweifel/git-auto-commit-action@v5
        with:
-          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 }}
+          commit_message: Commit Contributing Guidelines
+          file_pattern: "docs/contributing.md"
+          add_options: '--force'
        if: success()

      - name: Setup Python
--- a/.github/workflows/linutil.yml
+++ b/.github/workflows/linutil.yml
@ -46,9 +46,19 @@ 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: |
-          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
+          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()

      - name: Extract Version
        id: extract_version
@ -70,11 +80,32 @@ jobs:
          append_body: true
          generate_release_notes: true
          files: |
-            ./build/x86_64-unknown-linux-musl/release/linutil
-            ./build/aarch64-unknown-linux-musl/release/linutil-aarch64
+            ./build/linutil
+            ./build/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()
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@ -1,78 +0,0 @@
-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()
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -5,7 +5,7 @@ on:
    branches: ["main"]
    paths:
      - '**/*.rs'
-      - '**/Cargo.toml'
+      - 'Cargo.toml'
      - 'Cargo.lock'

 env:
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@ -1,9 +1,9 @@
-name: Script Checks
+name: ShellCheck

 on:
  pull_request:
    paths:
-      - '**/*.sh'
+      - 'core/tabs/**/*.sh'
  workflow_dispatch:

 jobs:
@ -11,25 +11,45 @@ jobs:
    name: Shellcheck
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+      - run: git fetch origin ${{ github.base_ref }}

-      - name: Run ShellCheck
-        uses: reviewdog/action-shellcheck@v1
-        with:
-          shellcheck_flags: '--source-path=${{ github.workspace }}/.shellcheckrc'
-          reviewdog_flags: '-fail-level=any'
+      - name: Download, setup, and run ShellCheck
+        shell: bash {0}
+        run : |
+          SC_URL="https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellcheck-v0.10.0.linux.x86_64.tar.xz"
+          curl -fsSL "$SC_URL" | tar -Jx
+          chmod +x "./shellcheck-v0.10.0/shellcheck"

-  shfmt:
-    name: Shell Fomatting
-    runs-on: ubuntu-latest
-    needs: shellcheck
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
+          error=0
+          files_to_check=$(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs)

-      - name: Run shfmt
-        uses: reviewdog/action-shfmt@v1
-        with:
-          shfmt_flags: '-i 4 -ci'
-          reviewdog_flags: '-fail-level=any'
+          for file in $files_to_check; do
+              if [[ "$file" == *.sh ]] && [[ -f "$file" ]]; then
+                  sc_output=$(./shellcheck-v0.10.0/shellcheck -fgcc -Serror "$file")
+                  iter_safe_parsed_errors=$(echo -e "$sc_output" | sed -n 's/\(.\+\)\:\([0-9]\+\)\:\([0-9]\+\)\: \(.*\)/::error file=\1,line=\2,col=\3::\4/p' | sed 's/ /:space:/g')
+
+                  for error in $iter_safe_parsed_errors; do
+                      echo "$error" | sed 's/:space:/ /g'
+                      error=1
+                  done
+
+                  tabs_detected=$(grep -nP '^\t+\S+' "$file")
+
+                  # fast fail on the action runner would fail immediately if there weren't any tabs found
+                  # this check makes sure that we don't continue if there's something really weird going on
+                  if [ "$?" = "2" ]; then
+                      echo "::error file=$file::There was a critical error while grepping $file, aborting"
+                      exit 1
+                  fi
+
+                  iter_safe_parsed_tabs_detected=$(echo "$tabs_detected" | sed -n 's,\([0-9]\+\).*,::error file='"$file"'\,line=\1::Found tab indentations,p' | sed 's/ /:space:/g')
+
+                  for error in $iter_safe_parsed_tabs_detected; do
+                      echo "$error" | sed 's/:space:/ /g'
+                      error=1
+                  done
+              fi
+          done
+
+          exit $error
--- 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.26.0
+        uses: crate-ci/typos@v1.25.0
--- a/.shellcheckrc
+++ b/.shellcheckrc
@ -1,3 +0,0 @@
-external-sources=true
-source=core/tabs/common-script.sh
-source=core/tabs/common-service-script.sh
--- a/Cargo.lock
+++ b/Cargo.lock
@ -30,10 +30,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"

 [[package]]
-name = "ansi-to-tui"
-version = "7.0.0"
+name = "android-tzdata"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67555e1f1ece39d737e28c8a017721287753af3f93225e4a445b29ccb0f5912c"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ansi-to-tui"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00c4af0bef1b514c9b6a32a773caf604c1390fa7913f4eaa23bfe76f251d6a42"
 dependencies = [
 "nom",
 "ratatui",
@ -121,6 +136,12 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"

+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@ -158,10 +179,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
-name = "clap"
-version = "4.5.20"
+name = "chrono"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -169,9 +204,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
 dependencies = [
 "anstream",
 "anstyle",
@ -217,6 +252,12 @@ dependencies = [
 "static_assertions",
 ]

+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "crossterm"
 version = "0.28.1"
@ -250,9 +291,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"

 [[package]]
 name = "ego-tree"
-version = "0.9.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53"
+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"

 [[package]]
 name = "either"
@ -329,6 +370,29 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "include_dir"
 version = "0.7.4"
@ -358,12 +422,6 @@ 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"
@ -404,6 +462,15 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@ -434,14 +501,16 @@ version = "24.9.28"
 dependencies = [
 "ansi-to-tui",
 "anstyle",
+ "chrono",
 "clap",
+ "crossterm",
+ "ego-tree",
 "linutil_core",
 "oneshot",
 "portable-pty",
 "rand",
 "ratatui",
 "temp-dir",
- "textwrap",
 "tree-sitter-bash",
 "tree-sitter-highlight",
 "tui-term",
@ -538,6 +607,15 @@ dependencies = [
 "minimal-lexical",
 ]

+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@ -665,23 +743,23 @@ dependencies = [

 [[package]]
 name = "ratatui"
-version = "0.29.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
+checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
 dependencies = [
 "bitflags 2.6.0",
 "cassowary",
 "compact_str",
 "crossterm",
- "indoc",
 "instability",
 "itertools",
 "lru",
 "paste",
 "strum",
+ "strum_macros",
 "unicode-segmentation",
 "unicode-truncate",
- "unicode-width 0.2.0",
+ "unicode-width 0.1.14",
 ]

 [[package]]
@ -888,12 +966,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"

-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@ -960,17 +1032,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-dependencies = [
- "smawk",
- "unicode-linebreak",
- "unicode-width 0.1.14",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.64"
@ -1027,9 +1088,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter"
-version = "0.24.3"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9871f16d6cf5c4757dcf30d5d2172a2df6987c510c017bbb7abfb7f9aa24d06"
+checksum = "23b84f60031bf8245b563a80c92c1034e557a914f7958f474bc0afa2eed78b98"
 dependencies = [
 "cc",
 "regex",
@ -1050,9 +1111,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter-highlight"
-version = "0.24.3"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48859aa39513716018d81904220960f415dbb72e071234a721304d20bf245e4c"
+checksum = "5c727fb31f816c09fc54dc0e971d101318926866f7261b2acb820e84a61bf52d"
 dependencies = [
 "lazy_static",
 "regex",
@ -1069,9 +1130,9 @@ checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"

 [[package]]
 name = "tui-term"
-version = "0.2.0"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72af159125ce32b02ceaced6cffae6394b0e6b6dfd4dc164a6c59a2db9b3c0b0"
+checksum = "d07f0233f0d4795d2dc6663cfc3ce56b87bebcee66d6bcc088aa6aff5c072361"
 dependencies = [
 "ratatui",
 "vt100",
@ -1083,12 +1144,6 @@ version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@ -1168,6 +1223,61 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
 [[package]]
 name = "which"
 version = "6.0.3"
@ -1202,6 +1312,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,6 +3,9 @@ license = "MIT"
 version = "24.9.28"
 edition = "2021"

+[workspace.dependencies]
+ego-tree = "0.6.2"
+
 [workspace]
 members = ["tui", "core", "xtask"]
 default-members = ["tui", "core"]
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@ -5,7 +5,11 @@ repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core"
 edition = "2021"
 version.workspace = true
 license.workspace = true
-include = ["src/*.rs", "Cargo.toml", "tabs/**"]
+include = [
+    "src/*.rs",
+    "Cargo.toml",
+    "tabs/**",
+]

 [dependencies]
 include_dir = "0.7.4"
@ -13,4 +17,4 @@ temp-dir = "0.1.14"
 serde = { version = "1.0.205", features = ["derive"], default-features = false }
 toml = { version = "0.8.19", features = ["parse"], default-features = false }
 which = "6.0.3"
-ego-tree = "0.9.0"
+ego-tree = { workspace = true }
--- a/core/src/inner.rs
+++ b/core/src/inner.rs
@ -1,7 +1,6 @@
 use std::{
    fs::File,
    io::{BufRead, BufReader, Read},
-    ops::{Deref, DerefMut},
    os::unix::fs::PermissionsExt,
    path::{Path, PathBuf},
    rc::Rc,
@ -15,34 +14,8 @@ use temp_dir::TempDir;

 const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/tabs");

-// Allow the unused TempDir to be stored for later destructor call
-#[allow(dead_code)]
-pub struct TabList(pub Vec<Tab>, TempDir);
-
-// Implement deref to allow Vec<Tab> methods to be called on TabList
-impl Deref for TabList {
-    type Target = Vec<Tab>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl DerefMut for TabList {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-impl IntoIterator for TabList {
-    type Item = Tab;
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-pub fn get_tabs(validate: bool) -> TabList {
-    let (temp_dir, tab_files) = TabDirectories::get_tabs();
+pub fn get_tabs(validate: bool) -> (TempDir, Vec<Tab>) {
+    let (temp_dir, tab_files) = TabList::get_tabs();

    let tabs: Vec<_> = tab_files
        .into_iter()
@ -60,28 +33,40 @@ pub fn get_tabs(validate: bool) -> TabList {

    let tabs: Vec<Tab> = tabs
        .into_iter()
-        .map(|(TabEntry { name, data }, directory)| {
-            let mut tree = Tree::new(Rc::new(ListNode {
-                name: "root".to_string(),
-                description: String::new(),
-                command: Command::None,
-                task_list: String::new(),
-                multi_select: false,
-            }));
-            let mut root = tree.root_mut();
-            create_directory(data, &mut root, &directory, validate, true);
-            Tab { name, tree }
-        })
+        .map(
+            |(
+                TabEntry {
+                    name,
+                    data,
+                    multi_selectable,
+                },
+                directory,
+            )| {
+                let mut tree = Tree::new(Rc::new(ListNode {
+                    name: "root".to_string(),
+                    description: String::new(),
+                    command: Command::None,
+                    task_list: String::new(),
+                }));
+                let mut root = tree.root_mut();
+                create_directory(data, &mut root, &directory, validate);
+                Tab {
+                    name,
+                    tree,
+                    multi_selectable,
+                }
+            },
+        )
        .collect();

    if tabs.is_empty() {
        panic!("No tabs found");
    }
-    TabList(tabs, temp_dir)
+    (temp_dir, tabs)
 }

 #[derive(Deserialize)]
-struct TabDirectories {
+struct TabList {
    directories: Vec<PathBuf>,
 }

@ -89,6 +74,12 @@ struct TabDirectories {
 struct TabEntry {
    name: String,
    data: Vec<Entry>,
+    #[serde(default = "default_multi_selectable")]
+    multi_selectable: bool,
+}
+
+fn default_multi_selectable() -> bool {
+    true
 }

 #[derive(Deserialize)]
@ -103,12 +94,6 @@ struct Entry {
    entry_type: EntryType,
    #[serde(default)]
    task_list: String,
-    #[serde(default = "default_true")]
-    multi_select: bool,
-}
-
-fn default_true() -> bool {
-    true
 }

 #[derive(Deserialize)]
@ -189,11 +174,8 @@ fn create_directory(
    node: &mut NodeMut<Rc<ListNode>>,
    command_dir: &Path,
    validate: bool,
-    parent_multi_select: bool,
 ) {
    for entry in data {
-        let multi_select = parent_multi_select && entry.multi_select;
-
        match entry.entry_type {
            EntryType::Entries(entries) => {
                let mut node = node.append(Rc::new(ListNode {
@ -201,9 +183,8 @@ fn create_directory(
                    description: entry.description,
                    command: Command::None,
                    task_list: String::new(),
-                    multi_select,
                }));
-                create_directory(entries, &mut node, command_dir, validate, multi_select);
+                create_directory(entries, &mut node, command_dir, validate);
            }
            EntryType::Command(command) => {
                node.append(Rc::new(ListNode {
@ -211,7 +192,6 @@ fn create_directory(
                    description: entry.description,
                    command: Command::Raw(command),
                    task_list: String::new(),
-                    multi_select,
                }));
            }
            EntryType::Script(script) => {
@ -230,7 +210,6 @@ fn create_directory(
                            file: script,
                        },
                        task_list: entry.task_list,
-                        multi_select,
                    }));
                }
            }
@ -273,9 +252,9 @@ fn is_executable(path: &Path) -> bool {
        .unwrap_or(false)
 }

-impl TabDirectories {
+impl TabList {
    fn get_tabs() -> (TempDir, Vec<PathBuf>) {
-        let temp_dir = TempDir::with_prefix("linutil_scripts").unwrap();
+        let temp_dir = TempDir::new().unwrap();
        TAB_DATA
            .extract(&temp_dir)
            .expect("Failed to extract the saved directory");
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@ -2,11 +2,10 @@ mod inner;

 use std::rc::Rc;

-pub use ego_tree;
 use ego_tree::Tree;
 use std::path::PathBuf;

-pub use inner::{get_tabs, TabList};
+pub use inner::get_tabs;

 #[derive(Clone, Hash, Eq, PartialEq)]
 pub enum Command {
@ -24,6 +23,7 @@ pub enum Command {
 pub struct Tab {
    pub name: String,
    pub tree: Tree<Rc<ListNode>>,
+    pub multi_selectable: bool,
 }

 #[derive(Clone, Hash, Eq, PartialEq)]
@ -32,5 +32,4 @@ pub struct ListNode {
    pub description: String,
    pub command: Command,
    pub task_list: String,
-    pub multi_select: bool,
 }
--- a/core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh
+++ b/core/tabs/applications-setup/Developer-tools/jetbrains-toolbox.sh
@ -1,48 +0,0 @@
-#!/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
--- 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 org.gnome.meld && ! command_exists meld; then
+    if ! command_exists meld; then
        printf "%b\n" "${YELLOW}Installing Meld...${RC}"
        case "$PACKAGER" in
            pacman)
@ -12,11 +12,8 @@ installMeld() {
            apt-get|nala)
                "$ESCALATION_TOOL" "$PACKAGER" -y install meld
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add meld
-                ;;
            *)
-                checkFlatpak
+                . ../setup-flatpak.sh
                flatpak install -y flathub org.gnome.meld
                ;;
        esac
--- a/core/tabs/applications-setup/Developer-tools/neovim-setup.sh
+++ b/core/tabs/applications-setup/Developer-tools/neovim-setup.sh
@ -29,9 +29,6 @@ installNeovim() {
        dnf|zypper)
            "$ESCALATION_TOOL" "$PACKAGER" install -y neovim ripgrep fzf python3-virtualenv luarocks golang ShellCheck git
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add neovim ripgrep fzf py3-virtualenv luarocks go shellcheck git
-            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
            exit 1
--- a/core/tabs/applications-setup/Developer-tools/vscode-setup.sh
+++ b/core/tabs/applications-setup/Developer-tools/vscode-setup.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installVsCode() {
-    if ! command_exists com.visualstudio.code && ! command_exists code; then
+    if ! command_exists code; then
        printf "%b\n" "${YELLOW}Installing VS Code..${RC}."
        case "$PACKAGER" in
            apt-get|nala)
@ -28,10 +28,6 @@ installVsCode() {
                printf "%b\n" '[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc' | "$ESCALATION_TOOL" tee /etc/yum.repos.d/vscode.repo > /dev/null
                "$ESCALATION_TOOL" "$PACKAGER" install -y code
                ;;
-            apk)
-                checkFlatpak
-                flatpak install -y flathub com.visualstudio.code
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/Developer-tools/vscodium-setup.sh
+++ b/core/tabs/applications-setup/Developer-tools/vscodium-setup.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installVsCodium() {
-    if ! command_exists com.vscodium.codium && ! command_exists codium; then
+    if ! command_exists codium; then
        printf "%b\n" "${YELLOW}Installing VS Codium...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -26,10 +26,6 @@ installVsCodium() {
                printf "%b\n" "[gitlab.com_paulcarroty_vscodium_repo]\nname=download.vscodium.com\nbaseurl=https://download.vscodium.com/rpms/\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg\nmetadata_expire=1h" | "$ESCALATION_TOOL" tee -a /etc/yum.repos.d/vscodium.repo
                "$ESCALATION_TOOL" "$PACKAGER" install -y codium
                ;;
-            apk)
-                checkFlatpak
-                flatpak install -y flathub com.vscodium.codium
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/alacritty-setup.sh
+++ b/core/tabs/applications-setup/alacritty-setup.sh
@ -9,9 +9,6 @@ installAlacritty() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm alacritty
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add alacritty
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y alacritty
                ;;
--- a/core/tabs/applications-setup/android-debloat.sh
+++ b/core/tabs/applications-setup/android-debloat.sh
@ -15,9 +15,6 @@ install_adb() {
            dnf|zypper)
                "$ESCALATION_TOOL" "$PACKAGER" install -y android-tools
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add android-tools
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
                exit 1
--- a/core/tabs/applications-setup/bottles-setup.sh
+++ b/core/tabs/applications-setup/bottles-setup.sh
@ -3,9 +3,14 @@
 . ../common-script.sh

 installBottles() {
-    if ! command_exists com.usebottles.bottles; then
-        printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
-        flatpak install -y flathub com.usebottles.bottles
+    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
    else
        printf "%b\n" "${GREEN}Bottles is already installed.${RC}"
    fi
@ -13,5 +18,4 @@ installBottles() {

 checkEnv
 checkEscalationTool
-checkFlatpak
 installBottles
--- a/core/tabs/applications-setup/browsers/brave.sh
+++ b/core/tabs/applications-setup/browsers/brave.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installBrave() {
-    if ! command_exists com.brave.Browser && ! command_exists brave; then
+    if ! command_exists brave; then
        printf "%b\n" "${YELLOW}Installing Brave...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -29,10 +29,6 @@ installBrave() {
                "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
                "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
                ;;
-            apk)
-                checkFlatpak
-                flatpak install -y flathub com.brave.Browser
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/browsers/chromium.sh
+++ b/core/tabs/applications-setup/browsers/chromium.sh
@ -9,9 +9,6 @@ if ! command_exists chromium; then
        pacman)
            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm chromium
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add chromium
-            ;;
        *)
            "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
            ;;
--- a/core/tabs/applications-setup/browsers/firefox.sh
+++ b/core/tabs/applications-setup/browsers/firefox.sh
@ -18,9 +18,6 @@ installFirefox() {
            dnf)
                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add firefox
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/browsers/librewolf.sh
+++ b/core/tabs/applications-setup/browsers/librewolf.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installLibreWolf() {
-    if ! command_exists io.gitlab.librewolf-community && ! command_exists librewolf; then
+    if ! command_exists librewolf; then
        printf "%b\n" "${YELLOW}Installing Librewolf...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -32,10 +32,6 @@ Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/
            pacman)
                "$AUR_HELPER" -S --needed --noconfirm librewolf-bin
                ;;
-            apk)
-                checkFlatpak
-                flatpak install flathub io.gitlab.librewolf-community
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/browsers/lynx.sh
+++ b/core/tabs/applications-setup/browsers/lynx.sh
@ -9,9 +9,6 @@ installLynx() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add lynx
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
                ;;
--- a/core/tabs/applications-setup/browsers/thorium.sh
+++ b/core/tabs/applications-setup/browsers/thorium.sh
@ -22,7 +22,6 @@ installThrorium() {
                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
                ;;
        esac
    else
--- a/core/tabs/applications-setup/browsers/vivaldi.sh
+++ b/core/tabs/applications-setup/browsers/vivaldi.sh
@ -2,39 +2,22 @@

 . ../../common-script.sh

-installVivaldi() {
-    if ! command_exists vivaldi; then
-        printf "%b\n" "${YELLOW}Installing Vivaldi...${RC}"
+installLynx() {
+    if ! command_exists lynx; then
+        printf "%b\n" "${YELLOW}Installing Lynx...${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 vivaldi
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
                ;;
            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
+                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
                ;;
        esac
    else
-        printf "%b\n" "${GREEN}Vivaldi Browser is already installed.${RC}"
+        printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}"
    fi
 }

 checkEnv
 checkEscalationTool
-installVivaldi
+installLynx
--- a/core/tabs/applications-setup/browsers/waterfox.sh
+++ b/core/tabs/applications-setup/browsers/waterfox.sh
@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-installWaterfox() {
-    if ! command_exists net.waterfox.waterfox && ! command_exists waterfox; then
-        printf "%b\n" "${YELLOW}Installing waterfox...${RC}"
-        case "$PACKAGER" in
-            pacman)
-		        "$AUR_HELPER" -S --needed --noconfirm waterfox-bin
-                ;;
-            *)
-		        checkFlatpak
-                flatpak install -y flathub net.waterfox.waterfox
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Waterfox is already installed.${RC}"
-    fi
-}
-
-checkEnv
-checkEscalationTool
-checkAURHelper
-installWaterfox
--- a/core/tabs/applications-setup/communication-apps/discord-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/discord-setup.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installDiscord() {
-    if ! command_exists com.discordapp.Discord && ! command_exists discord; then
+    if ! command_exists discord; then
        printf "%b\n" "${YELLOW}Installing Discord...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -20,10 +20,6 @@ installDiscord() {
                "$ESCALATION_TOOL" "$PACKAGER" install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
                "$ESCALATION_TOOL" "$PACKAGER" install -y discord
                ;;
-            apk)
-                checkFlatpak
-                flatpak install -y flathub com.discordapp.Discord
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/communication-apps/jitsi-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/jitsi-setup.sh
@ -3,7 +3,7 @@
 . ../../common-script.sh

 installJitsi() {
-    if ! command_exists org.jitsi.jitsi-meet && ! command_exists jitsi-meet; then
+    if ! command_exists jitsi-meet; then
        printf "%b\n" "${YELLOW}Installing Jitsi meet...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -21,10 +21,6 @@ installJitsi() {
            dnf)
                "$ESCALATION_TOOL" "$PACKAGER" install -y jitsi-meet
                ;;
-            apk)
-                checkFlatpak
-                flatpak install flathub org.jitsi.jitsi-meet
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- 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 org.signal.Signal && ! command_exists signal; then
+    if ! command_exists signal; then
        printf "%b\n" "${YELLOW}Installing Signal...${RC}"
        case "$PACKAGER" in
            apt-get|nala)
@ -20,12 +20,8 @@ installSignal() {
                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm signal-desktop
                ;;
            dnf)
-                checkFlatpak
-                flatpak install -y flathub org.signal.Signal
-                ;;
-            apk)
-                checkFlatpak
-                flatpak install -y flathub org.signal.Signal
+                "$ESCALATION_TOOL" "$PACKAGER" copr enable luminoso/Signal-Desktop
+                "$ESCALATION_TOOL" "$PACKAGER" install -y signal-desktop 
                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
--- 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 com.slack.Slack && ! command_exists slack; then
+    if ! command_exists slack; then
        printf "%b\n" "${YELLOW}Installing Slack...${RC}"
        case "$PACKAGER" in
            pacman)
                "$AUR_HELPER" -S --needed --noconfirm slack-desktop
                ;;
            *)  
-                checkFlatpak
+                . ../setup-flatpak.sh
                flatpak install -y flathub com.slack.Slack
                ;;
        esac
--- a/core/tabs/applications-setup/communication-apps/telegram-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/telegram-setup.sh
@ -9,9 +9,6 @@ installTelegram() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm telegram-desktop 
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add telegram-desktop
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop 
                ;;
--- a/core/tabs/applications-setup/communication-apps/thunderbird-setup.sh
+++ b/core/tabs/applications-setup/communication-apps/thunderbird-setup.sh
@ -9,9 +9,6 @@ installThunderBird() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm thunderbird
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add thunderbird
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird 
                ;;
--- 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 us.zoom.Zoom && ! command_exists zoom; then
+    if ! command_exists zoom; then
        printf "%b\n" "${YELLOW}Installing Zoom...${RC}"
        case "$PACKAGER" in
            pacman)
                "$AUR_HELPER" -S --needed --noconfirm zoom
                ;;
            *)
-                checkFlatpak
+                . ../setup-flatpak.sh
                flatpak install -y flathub us.zoom.Zoom
                ;;
        esac
--- a/core/tabs/applications-setup/docker-setup.sh
+++ b/core/tabs/applications-setup/docker-setup.sh
@ -1,10 +1,10 @@
 #!/bin/sh -e

 . ../common-script.sh
-. ../common-service-script.sh

 # Function to prompt the user for installation choice
 choose_installation() {
+    clear
    printf "%b\n" "${YELLOW}Choose what to install:${RC}"
    printf "%b\n" "1. ${YELLOW}Docker${RC}"
    printf "%b\n" "2. ${YELLOW}Docker Compose${RC}"
@ -26,28 +26,21 @@ 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
+            "$ESCALATION_TOOL" systemctl start docker
            ;;
        pacman)
            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm docker
-            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add docker
+            "$ESCALATION_TOOL" systemctl enable docker
+            "$ESCALATION_TOOL" systemctl start docker
            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
            exit 1
            ;;
    esac
-
-    startAndEnableService docker
 }

 install_docker_compose() {
@ -56,20 +49,12 @@ 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
            ;;
        pacman)
            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm docker-compose
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add docker-cli-compose
-            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
            exit 1
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@ -214,28 +214,10 @@ setupDisplayManager() {
        printf "%b\n" "${YELLOW}3. GDM ${RC}" 
        printf "%b\n" "${YELLOW} ${RC}" 
        printf "%b" "${YELLOW}Please select one: ${RC}"
-        read -r choice
-        case "$choice" in
-        1)
-            DM="sddm"
-            ;;
-        2)
-            DM="lightdm"
-            ;;
-        3)
-            DM="gdm"
-            ;;
-        *)
-            printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, or 3.${RC}"
-            exit 1
-            ;;
-        esac
+        read -r DM
        case "$PACKAGER" in
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DM"
-                if [ "$DM" = "lightdm" ]; then
-                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lightdm-gtk-greeter
-                fi
                ;;
            apt-get|nala)
                "$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"
--- a/core/tabs/applications-setup/fastfetch-setup.sh
+++ b/core/tabs/applications-setup/fastfetch-setup.sh
@ -14,9 +14,6 @@ installFastfetch() {
                "$ESCALATION_TOOL" "$PACKAGER" install -y /tmp/fastfetch.deb
                rm /tmp/fastfetch.deb
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add fastfetch
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y fastfetch
                ;;
--- a/core/tabs/applications-setup/kitty-setup.sh
+++ b/core/tabs/applications-setup/kitty-setup.sh
@ -9,9 +9,6 @@ installKitty() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm kitty
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add kitty
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y kitty
                ;;
--- a/core/tabs/applications-setup/linutil-installer.sh
+++ b/core/tabs/applications-setup/linutil-installer.sh
@ -39,17 +39,10 @@ installLinutil() {
                        printf "%b\n" "${YELLOW}Installing rustup...${RC}"
                        case "$PACKAGER" in
                            pacman)
-                                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm curl rustup man-db
+                                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rustup
                                ;;
                            dnf)
-                                "$ESCALATION_TOOL" "$PACKAGER" install -y curl rustup man-pages man-db man
-                                ;;
-                            apk)
-                                "$ESCALATION_TOOL" "$PACKAGER" add build-base
-                                "$ESCALATION_TOOL" "$PACKAGER" add rustup
-                                rustup-init
-                                # shellcheck disable=SC1091
-                                . "$HOME/.cargo/env"
+                                "$ESCALATION_TOOL" "$PACKAGER" install -y rustup
                                ;;
                            *)
                                curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@ -60,23 +53,12 @@ installLinutil() {
                    rustup default stable
                    cargo install --force linutil_tui
                    printf "%b\n" "${GREEN}Installed successfully.${RC}"
-                    installExtra
                    ;;
                *) printf "%b\n" "${RED}Linutil not installed.${RC}" ;;
            esac
    esac
 }

-installExtra() {
-    printf "%b\n" "${YELLOW}Installing the manpage...${RC}"
-    "$ESCALATION_TOOL" mkdir -p /usr/share/man/man1
-    curl 'https://raw.githubusercontent.com/ChrisTitusTech/linutil/refs/heads/main/man/linutil.1' | "$ESCALATION_TOOL" tee '/usr/share/man/man1/linutil.1' > /dev/null
-    printf "%b\n" "${YELLOW}Creating a Desktop Entry...${RC}"
-    "$ESCALATION_TOOL" mkdir -p /usr/share/applications
-    curl 'https://raw.githubusercontent.com/ChrisTitusTech/linutil/refs/heads/main/linutil.desktop' | "$ESCALATION_TOOL" tee /usr/share/applications/linutil.desktop > /dev/null
-    printf "%b\n" "${GREEN}Done.${RC}"
-}
-
 checkEnv
 checkEscalationTool
 checkAURHelper
--- a/core/tabs/applications-setup/linutil-updater.sh
+++ b/core/tabs/applications-setup/linutil-updater.sh
@ -19,13 +19,6 @@ updateLinutil() {
                    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
                    . $HOME/.cargo/env
                    ;;
-                apk)
-                    "$ESCALATION_TOOL" "$PACKAGER" add build-base
-                    "$ESCALATION_TOOL" "$PACKAGER" add rustup
-                    rustup-init
-                    # shellcheck disable=SC1091
-                    . "$HOME/.cargo/env"
-                    ;;
                *)
                    "$ESCALATION_TOOL" "$PACKAGER" install -y rustup
                    ;;
--- a/core/tabs/applications-setup/mybash-setup.sh
+++ b/core/tabs/applications-setup/mybash-setup.sh
@ -5,19 +5,16 @@
 gitpath="$HOME/.local/share/mybash"

 installDepend() {
-    if [ ! -f "/usr/share/bash-completion/bash_completion" ] || ! command_exists bash tar bat tree unzip fc-list git; then
-        printf "%b\n" "${YELLOW}Installing Bash...${RC}"
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
-                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add bash bash-completion tar bat tree unzip fontconfig git
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
-                ;;
-        esac
+    if ! command_exists bash bash-completion tar bat tree unzip fontconfig git; then
+    printf "%b\n" "${YELLOW}Installing Bash...${RC}"
+    case "$PACKAGER" in
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
+            ;;
+        *)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
+            ;;
+    esac
    fi
 }

@ -57,7 +54,7 @@ installStarshipAndFzf() {
        return
    fi

-    if ! curl -sSL https://starship.rs/install.sh | "$ESCALATION_TOOL" sh; then
+    if ! curl -sSL https://starship.rs/install.sh | sh; then
        printf "%b\n" "${RED}Something went wrong during starship install!${RC}"
        exit 1
    fi
--- a/core/tabs/applications-setup/office-suites/freeoffice.sh
+++ b/core/tabs/applications-setup/office-suites/freeoffice.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installFreeOffice() {  
    if ! command_exists softmaker-freeoffice-2024 freeoffice softmaker; then
--- a/core/tabs/applications-setup/office-suites/libreoffice.sh
+++ b/core/tabs/applications-setup/office-suites/libreoffice.sh
@ -1,24 +1,21 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installLibreOffice() {
-    if ! command_exists org.libreoffice.LibreOffice && ! command_exists libreoffice; then
+    if ! 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)
-                checkFlatpak
+                . ./setup-flatpak.sh
                flatpak install -y flathub org.libreoffice.LibreOffice
                ;;
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libreoffice-fresh
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add libreoffice
-                ;;
            *)
                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                exit 1
--- a/core/tabs/applications-setup/office-suites/onlyoffice.sh
+++ b/core/tabs/applications-setup/office-suites/onlyoffice.sh
@ -1,9 +1,9 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installOnlyOffice() {
-    if ! command_exists org.onlyoffice.desktopeditors && ! command_exists onlyoffice-desktopeditors; then
+    if ! 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)
-                checkFlatpak
+                . ./setup-flatpak.sh
                flatpak install -y flathub org.onlyoffice.desktopeditors
                ;;
            pacman)
--- a/core/tabs/applications-setup/office-suites/wpsoffice.sh
+++ b/core/tabs/applications-setup/office-suites/wpsoffice.sh
@ -1,16 +1,16 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installWpsOffice() {
-    if ! command_exists com.wps.Office && ! command_exists wps; then
+    if ! command_exists com.wps.Office; then
        printf "%b\n" "${YELLOW}Installing WPS Office...${RC}"
        case "$PACKAGER" in
            pacman)
                "$AUR_HELPER" -S --needed --noconfirm wps-office
                ;;
            *)
-                checkFlatpak
+                . ./setup-flatpak.sh
                flatpak install flathub com.wps.Office
                ;;
        esac
--- a/core/tabs/applications-setup/pdf-suites/evince.sh
+++ b/core/tabs/applications-setup/pdf-suites/evince.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installEvince() {
    if ! command_exists evince; then
@ -9,9 +9,6 @@ installEvince() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm evince
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add evince
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y evince
                ;;
--- a/core/tabs/applications-setup/pdf-suites/okular.sh
+++ b/core/tabs/applications-setup/pdf-suites/okular.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installOkular() {
    if ! command_exists okular; then
@ -9,9 +9,6 @@ installOkular() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm okular
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add okular
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y okular
                ;;
--- a/core/tabs/applications-setup/pdf-suites/pdfstudio.sh
+++ b/core/tabs/applications-setup/pdf-suites/pdfstudio.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installPdfstudio() {
    if ! command_exists pdfstudio2024; then
--- a/core/tabs/applications-setup/pdf-suites/pdfstudioviewer.sh
+++ b/core/tabs/applications-setup/pdf-suites/pdfstudioviewer.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../../common-script.sh
+. ../common-script.sh

 installPdfstudioviewer() {
    if ! command_exists pdfstudioviewer2024; then
--- a/core/tabs/applications-setup/podman-compose-setup.sh
+++ b/core/tabs/applications-setup/podman-compose-setup.sh
@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-. ../common-script.sh
-
-installPodmanCompose() {
-    if ! command_exists podman-compose; then
-        printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
-                ;;
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
-                exit 1
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
-    fi
-}
-
-checkEnv
-checkEscalationTool
-installPodmanCompose
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-. ../common-script.sh
-
-installPodman() {
-    if ! command_exists podman; then
-        printf "%b\n" "${YELLOW}Installing Podman...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y podman
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
-                ;;
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y podman
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
-                exit 1
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Podman is already installed.${RC}"
-    fi
-}
-
-checkEnv
-checkEscalationTool
-installPodman
--- a/core/tabs/applications-setup/rofi-setup.sh
+++ b/core/tabs/applications-setup/rofi-setup.sh
@ -9,9 +9,6 @@ installRofi() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rofi
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add rofi
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y rofi
                ;;
--- a/core/tabs/applications-setup/setup-flatpak.sh
+++ b/core/tabs/applications-setup/setup-flatpak.sh
@ -2,7 +2,9 @@

 . ../common-script.sh

-checkDE() {
+# 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() {
    if [ -n "$XDG_CURRENT_DESKTOP" ]; then
        case "$XDG_CURRENT_DESKTOP" in
            *GNOME*)
@ -15,11 +17,42 @@ checkDE() {
    fi
 }

-installExtra() {
+# 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
+
    if [ "$PACKAGER" = "apt-get" ] || [ "$PACKAGER" = "nala" ]; then
-        checkDE
+        detect_de
        # 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 software manager they can setup it here
+        # So in case the user wants to use a GUI siftware 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
@ -39,5 +72,4 @@ installExtra() {

 checkEnv
 checkEscalationTool
-checkFlatpak
-installExtra
+setup_flatpak
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@ -1,5 +1,50 @@
 name = "Applications Setup"

+[[data]]
+name = "Developer Tools"
+
+[[data.entries]]
+name = "Github Desktop"
+description = "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."
+script = "Developer-tools/githubdesktop-setup.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Neovim"
+description = "Neovim is a refactor, and sometimes redactor, in the tradition of Vim.\nIt is not a rewrite but a continuation and extension of Vim.\nThis command configures neovim from CTT's neovim configuration.\nhttps://github.com/ChrisTitusTech/neovim"
+script = "Developer-tools/neovim-setup.sh"
+task_list = "I FM"
+
+[[data.entries]]
+name = "Sublime Text"
+description = "Sublime Text is a fast, lightweight, and customizable text editor known for its simplicity, powerful features, and wide range of plugins for various programming languages."
+script = "Developer-tools/sublime-setup.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "VS Code"
+description = "Visual Studio Code (VS Code) is a lightweight, open-source code editor with built-in support for debugging, version control, and extensions for various programming languages and frameworks."
+script = "Developer-tools/vscode-setup.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "VS Codium"
+description = "VSCodium is a free, open-source version of Visual Studio Code (VS Code) that removes Microsoft-specific telemetry and branding."
+script = "Developer-tools/vscodium-setup.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."
+script = "Developer-tools/meld-setup.sh"
+task_list = "I FI"
+
+[[data.entries]]
+name = "Ngrok"
+description = "Ngrok is a tool that creates secure, temporary tunnels to expose local servers to the internet for testing and development."
+script = "Developer-tools/ngrok-setup.sh"
+task_list = "I"
+
 [[data]]
 name = "Communication Apps"

@ -33,77 +78,21 @@ description = "Telegram is a cloud-based messaging app known for its speed and s
 script = "communication-apps/telegram-setup.sh"
 task_list = "I"

-[[data.entries]]
-name = "Thunderbird"
-description = "Thunderbird is a free, open-source email client that offers powerful features like customizable email management, a built-in calendar, and extensive add-ons for enhanced functionality."
-script = "communication-apps/thunderbird-setup.sh"
-task_list = "I"
-
 [[data.entries]]
 name = "Zoom"
 description = "Zoom is a widely-used video conferencing platform that allows users to host virtual meetings, webinars, and online collaboration with features like screen sharing and recording."
 script = "communication-apps/zoom-setup.sh"
 task_list = "I"

-[[data]]
-name = "Developer Tools"
-
 [[data.entries]]
-name = "Github Desktop"
-description = "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."
-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."
-script = "Developer-tools/meld-setup.sh"
-task_list = "I FI"
-
-[[data.entries]]
-name = "Neovim"
-description = "Neovim is a refactor, and sometimes redactor, in the tradition of Vim.\nIt is not a rewrite but a continuation and extension of Vim.\nThis command configures neovim from CTT's neovim configuration.\nhttps://github.com/ChrisTitusTech/neovim"
-script = "Developer-tools/neovim-setup.sh"
-task_list = "I FM"
-
-[[data.entries]]
-name = "Ngrok"
-description = "Ngrok is a tool that creates secure, temporary tunnels to expose local servers to the internet for testing and development."
-script = "Developer-tools/ngrok-setup.sh"
-task_list = "I"
-
-[[data.entries]]
-name = "Sublime Text"
-description = "Sublime Text is a fast, lightweight, and customizable text editor known for its simplicity, powerful features, and wide range of plugins for various programming languages."
-script = "Developer-tools/sublime-setup.sh"
-task_list = "I"
-
-[[data.entries]]
-name = "VS Code"
-description = "Visual Studio Code (VS Code) is a lightweight, open-source code editor with built-in support for debugging, version control, and extensions for various programming languages and frameworks."
-script = "Developer-tools/vscode-setup.sh"
-task_list = "I"
-
-[[data.entries]]
-name = "VS Codium"
-description = "VSCodium is a free, open-source version of Visual Studio Code (VS Code) that removes Microsoft-specific telemetry and branding."
-script = "Developer-tools/vscodium-setup.sh"
+name = "Thunderbird"
+description = "Thunderbird is a free, open-source email client that offers powerful features like customizable email management, a built-in calendar, and extensive add-ons for enhanced functionality."
+script = "communication-apps/thunderbird-setup.sh"
 task_list = "I"

 [[data]]
 name = "Office Suites"

-[[data.entries]]
-name = "FreeOffice"
-script = "office-suites/freeoffice.sh"
-task_list = "I"
-
 [[data.entries]]
 name = "LibreOffice"
 script = "office-suites/libreoffice.sh"
@ -114,6 +103,11 @@ name = "OnlyOffice"
 script = "office-suites/onlyoffice.sh"
 task_list = "I"

+[[data.entries]]
+name = "FreeOffice"
+script = "office-suites/freeoffice.sh"
+task_list = "I"
+
 [[data.entries]]
 name = "WPS Office"
 script = "office-suites/wpsoffice.sh"
@ -192,15 +186,9 @@ description = "Vivaldi is a freeware, cross-platform web browser developed by Vi
 script = "browsers/vivaldi.sh"
 task_list = "I"

-[[data.entries]]
-name = "waterfox"
-description = "Waterfox is the privacy-focused web browser engineered to give you speed, control, and peace of mind on the internet."
-script = "browsers/waterfox.sh"
-task_list = "FI"
-
 [[data]]
 name = "Alacritty"
-description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows. This command installs and configures alacritty terminal emulator."
+description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.\nThis command installs and condifures alacritty terminal emulator."
 script = "alacritty-setup.sh"
 task_list = "I FM"

@ -212,49 +200,37 @@ task_list = "I"

 [[data]]
 name = "Bash Prompt"
-description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
+description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems.\nIt is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful.\nThis command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
 script = "mybash-setup.sh"
 task_list = "I FM"

 [[data]]
 name = "Bottles"
-description = "Bottles allows Windows software, like applications and games, to run on Linux. Bottles also provides tools to categorize, organize and optimize your applications."
+description = "Bottles allows Windows software, like applications and games, to run on Linux.\nBottles also provides tools to categorize, organize and optimize your applications."
 script = "bottles-setup.sh"
 task_list = "FI"

-[[data]]
-name = "Docker"
-description = "Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers."
-script = "docker-setup.sh"
-task_list = "I SS"
-
-[[data]]
-name = "Podman"
-description = "Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers."
-script = "podman-setup.sh"
-task_list = "I SS"
-
-[[data]]
-name = "Podman-compose"
-description = "Podman Compose is a tool for defining and running multi-container applications using Podman."
-script = "podman-compose-setup.sh"
-task_list = "I SS"
-
 [[data]]
 name = "DWM-Titus"
 description = "DWM is a dynamic window manager for X.\nIt manages windows in tiled, monocle and floating layouts.\nAll of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed.\nThis command installs and configures DWM and a desktop manager.\nThe list of patches applied can be found in CTT's DWM repository\nhttps://github.com/ChrisTitusTech/dwm-titus"
 script = "dwmtitus-setup.sh"
 task_list = "I PFM SS"

+[[data]]
+name = "Docker"
+description = "Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers."
+script = "docker-setup.sh"
+task_list = "I SS"
+
 [[data]]
 name = "Fastfetch"
-description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. This command installs fastfetch and configures from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
+description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
 script = "fastfetch-setup.sh"
 task_list = "I FM"

 [[data]]
 name = "Flatpak / Flathub"
-description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns. This command installs Flatpak and adds the Flathub repository"
+description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.\nThis command installs Flatpak and adds the Flathub repository"
 script = "setup-flatpak.sh"
 task_list = "I"

@ -266,7 +242,7 @@ task_list = "PFM"

 [[data]]
 name = "Kitty"
-description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features. kitty is written in a mix of C and Python programming languages. This command installs and configures kitty."
+description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.\nkitty is written in a mix of C and Python programming languages.\n This command installs and configures kitty."
 script = "kitty-setup.sh"
 task_list = "I FM"

@ -294,7 +270,7 @@ values = [ "linutil" ]

 [[data]]
 name = "Rofi"
-description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport. This command installs and configures rofi with configuration from CTT's DWM repo. https://github.com/ChrisTitusTech/dwm-titus"
+description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport.\nThis command installs and configures rofi with configuration from CTT's DWM repo.\nhttps://github.com/ChrisTitusTech/dwm-titus"
 script = "rofi-setup.sh"
 task_list = "I FM"

@ -310,6 +286,6 @@ values = [ "wayland", "Wayland" ]

 [[data]]
 name = "ZSH Prompt"
-description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh. This command installs ZSH prompt and provides basic configuration."
+description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.\nThis command installs ZSH prompt and provides basic configuration."
 script = "zsh-setup.sh"
-task_list = "I FM"
+task_list = "I FM"
--- a/core/tabs/applications-setup/waydroid-setup.sh
+++ b/core/tabs/applications-setup/waydroid-setup.sh
@ -15,17 +15,10 @@ installWaydroid() {
        case "$PACKAGER" in
            pacman)
                "$AUR_HELPER" -S --needed --noconfirm waydroid
-                if ! command_exists dkms; then
-                    installed_kernels=$("$PACKAGER" -Q | grep -E '^linux(| |-rt|-rt-lts|-hardened|-zen|-lts)[^-headers]' | cut -d ' ' -f 1)
-                    for kernel in $installed_kernels; do
-                        header="${kernel}-headers"
-                        printf "%b\n" "${CYAN}Installing headers for $kernel...${RC}"
-                        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$header"
-                    done
-                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dkms
+                if command_exists dkms; then
+                    "$AUR_HELPER" -S --needed --noconfirm binder_linux-dkms
+                    "$ESCALATION_TOOL" modprobe binder-linux device=binder,hwbinder,vndbinder
                fi
-                "$AUR_HELPER" -S --needed --noconfirm binder_linux-dkms
-                "$ESCALATION_TOOL" modprobe binder-linux device=binder,hwbinder,vndbinder
                ;;
            apt-get|nala)
                curl https://repo.waydro.id | "$ESCALATION_TOOL" sh
--- a/core/tabs/applications-setup/zsh-setup.sh
+++ b/core/tabs/applications-setup/zsh-setup.sh
@ -10,9 +10,6 @@ installZsh() {
          pacman)
              "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm zsh
              ;;
-          apk)
-              "$ESCALATION_TOOL" "$PACKAGER" add zsh
-              ;;
          *)
              "$ESCALATION_TOOL" "$PACKAGER" install -y zsh
              ;;
--- a/core/tabs/common-script.sh
+++ b/core/tabs/common-script.sh
@ -9,48 +9,7 @@ CYAN='\033[36m'
 GREEN='\033[32m'

 command_exists() {
-for cmd in "$@"; do
-    export PATH="$HOME/.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}"
+    command -v "$1" >/dev/null 2>&1
 }

 checkAURHelper() {
@ -123,12 +82,6 @@ checkPackageManager() {
        fi
    done

-    ## Enable apk community packages
-    if [ "$PACKAGER" = "apk" ] && grep -qE '^#.*community' /etc/apk/repositories; then
-        "$ESCALATION_TOOL" sed -i '/community/s/^#//' /etc/apk/repositories
-        "$ESCALATION_TOOL" "$PACKAGER" update
-    fi
-
    if [ -z "$PACKAGER" ]; then
        printf "%b\n" "${RED}Can't find a supported package manager${RC}"
        exit 1
@ -172,10 +125,9 @@ checkDistro() {
 }

 checkEnv() {
-    checkArch
    checkEscalationTool
    checkCommandRequirements "curl groups $ESCALATION_TOOL"
-    checkPackageManager 'nala apt-get dnf pacman zypper apk'
+    checkPackageManager 'nala apt-get dnf pacman zypper'
    checkCurrentDirectoryWritable
    checkSuperUser
    checkDistro
--- a/core/tabs/common-service-script.sh
+++ b/core/tabs/common-service-script.sh
@ -1,85 +0,0 @@
-#!/bin/sh -e
-
-checkInitManager() {
-    for manager in $1; do
-        if command_exists "$manager"; then
-            INIT_MANAGER="$manager"
-            printf "%b\n" "${CYAN}Using ${manager} to interact with init system${RC}"
-            break
-        fi
-    done
-
-    if [ -z "$INIT_MANAGER" ]; then
-        printf "%b\n" "${RED}Can't find a supported init system${RC}"
-        exit 1
-    fi
-}
-
-startService() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" start "$1"
-            ;;
-        rc-service)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" "$1" start
-            ;;
-    esac
-}
-
-stopService() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" stop "$1"
-            ;;
-        rc-service)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" "$1" stop
-            ;;
-    esac
-}
-
-enableService() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" enable "$1"
-            ;;
-        rc-service)
-            "$ESCALATION_TOOL" rc-update add "$1"
-            ;;
-    esac
-}
-
-disableService() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" disable "$1"
-            ;;
-        rc-service)
-            "$ESCALATION_TOOL" rc-update del "$1"
-            ;;
-    esac
-}
-
-startAndEnableService() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" enable --now "$1"
-            ;;
-        rc-service)
-            enableService "$1"
-            startService "$1"
-            ;;
-    esac
-}
-
-isServiceActive() {
-    case "$INIT_MANAGER" in
-        systemctl)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" is-active --quiet "$1"
-            ;;
-        rc-service)
-            "$ESCALATION_TOOL" "$INIT_MANAGER" "$1" status --quiet
-            ;;
-    esac
-}
-
-checkInitManager 'systemctl rc-service'
--- a/core/tabs/gaming/tab_data.toml
+++ b/core/tabs/gaming/tab_data.toml
@ -5,6 +5,6 @@ name = "Diablo II Resurrected"

 [[data.entries]]
 name = "Loot Filter"
-description = "This is a loot filter for Diablo II Resurrected. It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items. Works on battle.net and single player. No frills, no config, just highlights high runes and other valuable items. For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
+description = "This is a loot filter for Diablo II Resurrected.\nIt's designed to be a simple, clean, and easy to read loot filter that highlights the most important items.\nWorks on battle.net and single player.\nNo frills, no config, just highlights high runes and other valuable items.\nFor more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
 script = "diablo-ii/d2r-loot-filters.sh"
 task_list = "FM"
--- a/core/tabs/security/firewall-baselines.sh
+++ b/core/tabs/security/firewall-baselines.sh
@ -9,9 +9,6 @@ installPkg() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm ufw
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add ufw
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y ufw
                ;;
--- a/core/tabs/security/tab_data.toml
+++ b/core/tabs/security/tab_data.toml
@ -2,6 +2,6 @@ name = "Security"

 [[data]]
 name = "Firewall Baselines (CTT)"
-description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall. This command installs UFW and configures UFW based on CTT's recommended rules. For more information visit: https://christitus.com/linux-security-mistakes"
+description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall.\nThis command installs UFW and configures UFW based on CTT's recommended rules.\nFor more information visit: https://christitus.com/linux-security-mistakes"
 script = "firewall-baselines.sh"
 task_list = "I SS"
--- a/core/tabs/system-setup/arch/linux-neptune.sh
+++ b/core/tabs/system-setup/arch/linux-neptune.sh
@ -1,60 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-setUpRepos() {
-    if ! grep -q "^\s*\[jupiter-staging\]" /etc/pacman.conf; then
-        printf "%b\n" "${CYAN}Adding jupiter-staging to pacman repositories...${RC}"
-        echo "[jupiter-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-        echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-        echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-    fi
-    if ! grep -q "^\s*\[holo-staging\]" /etc/pacman.conf; then
-        printf "%b\n" "${CYAN}Adding holo-staging to pacman repositories...${RC}"
-        echo "[holo-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-        echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-        echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf
-    fi
-}
-
-installKernel() {
-    if ! "$PACKAGER" -Q | grep -q "\blinux-neptune"; then
-        printf "%b\n" "${CYAN}Installing linux-neptune..."
-        "$ESCALATION_TOOL" "$PACKAGER" -Syyu --noconfirm
-        "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm linux-neptune linux-neptune-headers steamdeck-dsp jupiter-staging/alsa-ucm-conf
-        "$ESCALATION_TOOL" mkinitcpio -P
-    else
-        printf "%b\n" "${GREEN}linux-neptune detected. Skipping installation.${RC}"
-    fi
-
-    if [ -f /etc/default/grub ]; then
-        printf "%b\n" "${CYAN}Updating GRUB...${RC}"
-    if ! grep -q '^UPDATEDEFAULT=' /etc/default/grub; then
-        echo 'UPDATEDEFAULT=yes' | "$ESCALATION_TOOL" tee -a /etc/default/grub
-    else
-        "$ESCALATION_TOOL" sed -i 's/^UPDATEDEFAULT=.*/UPDATEDEFAULT=yes/' /etc/default/grub
-    fi
-    if [ -f /boot/grub/grub.cfg ]; then
-        "$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg
-    else
-        printf "%b\n" "${RED}GRUB configuration file not found. Run grub-mkconfig manually.${RC}"
-    fi
-    else
-        printf "%b\n" "${RED}GRUB not detected. Manually set your bootloader to use linux-neptune.${RC}"
-    fi
-}
-
-copyFirmwareFiles() {
-    printf "%b\n" "${CYAN}Copying firmware files...${RC}"
-    "$ESCALATION_TOOL" mkdir -p /usr/lib/firmware/cirrus
-    "$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-cali.bin /usr/lib/firmware/cirrus/
-    "$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-cali.wmfw  /usr/lib/firmware/cirrus/
-    "$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-prot.bin  /usr/lib/firmware/cirrus/
-    "$ESCALATION_TOOL" cp /usr/lib/firmware/cs35l41-dsp1-spk-prot.wmfw  /usr/lib/firmware/cirrus/
-}
-
-checkEnv
-checkEscalationTool
-setUpRepos
-installKernel
-copyFirmwareFiles
--- a/core/tabs/system-setup/arch/nvidia-drivers.sh
+++ b/core/tabs/system-setup/arch/nvidia-drivers.sh
@ -1,120 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-LIBVA_DIR="$HOME/.local/share/linutil/libva"
-MPV_CONF="$HOME/.config/mpv/mpv.conf"
-
-installDeps() {
-    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel dkms ninja meson git
-
-    installed_kernels=$("$PACKAGER" -Q | grep -E '^linux(| |-rt|-rt-lts|-hardened|-zen|-lts)[^-headers]' | cut -d ' ' -f 1)
-
-    for kernel in $installed_kernels; do
-        header="${kernel}-headers"
-        printf "%b\n" "${CYAN}Installing headers for $kernel...${RC}"
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$header"
-    done
-}
-
-checkNvidiaHardware() {
-    # Refer https://nouveau.freedesktop.org/CodeNames.html for model code names
-    model=$(lspci -k | grep -A 2 -E "(VGA|3D)" | grep NVIDIA | sed 's/.*Corporation //;s/ .*//' | cut -c 1-2)
-    case "$model" in
-        GM | GP | GV) return 1 ;;
-        TU | GA | AD) return 0 ;;
-        *) printf "%b\n" "${RED}Unsupported hardware." && exit 1 ;;
-    esac
-}
-
-checkIntelHardware() {
-    model=$(grep "model name" /proc/cpuinfo | head -n 1 | cut -d ':' -f 2 | cut -c 2-3)
-    [ "$model" -ge 11 ]
-}
-
-promptUser() {
-    printf "%b" "Do you want to $1 ? [y/N]:"
-    read -r confirm
-    [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]
-}
-
-setKernelParam() {
-    PARAMETER="$1"
-
-    if grep -q "$PARAMETER" /etc/default/grub; then
-        printf "%b\n" "${YELLOW}NVIDIA modesetting is already enabled in GRUB.${RC}"
-    else
-        "$ESCALATION_TOOL" sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT=/ s/\"$/ $PARAMETER\"/" /etc/default/grub
-        printf "%b\n" "${CYAN}Added $PARAMETER to /etc/default/grub.${RC}"
-        "$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg
-    fi
-}
-
-setupHardwareAcceleration() {
-    if ! command_exists grub-mkconfig; then
-        printf "%b\n" "${RED}Currently hardware acceleration is only available with GRUB.${RC}"
-        return
-    fi
-
-    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libva-nvidia-driver
-
-    mkdir -p "$HOME/.local/share/linutil"
-    if [ -d "$LIBVA_DIR" ]; then
-        rm -rf "$LIBVA_DIR"
-    fi
-
-    printf "%b\n" "${YELLOW}Cloning libva from https://github.com/intel/libva in ${LIBVA_DIR}${RC}"
-    git clone --branch=v2.22-branch --depth=1 https://github.com/intel/libva "$LIBVA_DIR"
-
-    mkdir -p "$LIBVA_DIR/build"
-    cd "$LIBVA_DIR/build" && arch-meson .. -Dwith_legacy=nvctrl && ninja
-    "$ESCALATION_TOOL" ninja install
-
-    "$ESCALATION_TOOL" sed -i '/^MOZ_DISABLE_RDD_SANDBOX/d' "/etc/environment"
-    "$ESCALATION_TOOL" sed -i '/^LIBVA_DRIVER_NAME/d' "/etc/environment"
-
-    printf "LIBVA_DRIVER_NAME=nvidia\nMOZ_DISABLE_RDD_SANDBOX=1" | "$ESCALATION_TOOL" tee -a /etc/environment >/dev/null
-
-    printf "%b\n" "${GREEN}Hardware Acceleration setup completed successfully.${RC}"
-
-    if promptUser "enable Hardware Acceleration in MPV player"; then
-        mkdir -p "$HOME/.config/mpv"
-        if [ -f "$MPV_CONF" ]; then
-            sed -i '/^hwdec/d' "$MPV_CONF"
-        fi
-        printf "hwdec=auto" | tee -a "$MPV_CONF" >/dev/null
-        printf "%b\n" "${GREEN}MPV Hardware Acceleration enabled successfully.${RC}"
-    fi
-}
-
-installDriver() {
-    # Refer https://wiki.archlinux.org/title/NVIDIA for open-dkms or dkms driver selection
-    if checkNvidiaHardware && promptUser "install nvidia's open source drivers"; then
-        printf "%b\n" "${YELLOW}Installing nvidia open source driver...${RC}"
-        installDeps
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm nvidia-open-dkms nvidia-utils
-    else
-        printf "%b\n" "${YELLOW}Installing nvidia proprietary driver...${RC}"
-        installDeps
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm nvidia-dkms nvidia-utils
-    fi
-
-    if checkIntelHardware; then
-        setKernelParam "ibt=off"
-    fi
-
-    # Refer https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend
-    setKernelParam "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
-    "$ESCALATION_TOOL" systemctl enable nvidia-suspend.service nvidia-hibernate.service nvidia-resume.service
-
-    printf "%b\n" "${GREEN}Driver installed successfully.${RC}"
-    if promptUser "setup Hardware Acceleration"; then
-        setupHardwareAcceleration
-    fi
-
-    printf "%b\n" "${GREEN}Please reboot your system for the changes to take effect.${RC}"
-}
-
-checkEnv
-checkEscalationTool
-installDriver
--- a/core/tabs/system-setup/arch/paru-setup.sh
+++ b/core/tabs/system-setup/arch/paru-setup.sh
@ -8,8 +8,8 @@ installDepend() {
            if ! command_exists paru; then
                printf "%b\n" "${YELLOW}Installing paru as AUR helper...${RC}"
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel git
-                cd /opt && "$ESCALATION_TOOL" git clone https://aur.archlinux.org/paru-bin.git && "$ESCALATION_TOOL" chown -R "$USER": ./paru-bin
-                cd paru-bin && makepkg --noconfirm -si
+                cd /opt && "$ESCALATION_TOOL" git clone https://aur.archlinux.org/paru.git && "$ESCALATION_TOOL" chown -R "$USER": ./paru
+                cd paru && makepkg --noconfirm -si
                printf "%b\n" "${GREEN}Paru installed${RC}"
            else
                printf "%b\n" "${GREEN}Paru already installed${RC}"
--- 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,36 +386,33 @@ fi

 if [[ "${FS}" == "btrfs" ]]; then
    mkfs.vfat -F32 -n "EFIBOOT" "${partition2}"
-    mkfs.btrfs -f "${partition3}"
+    mkfs.btrfs -L ROOT "${partition3}" -f
    mount -t btrfs "${partition3}" /mnt
    subvolumesetup
 elif [[ "${FS}" == "ext4" ]]; then
    mkfs.vfat -F32 -n "EFIBOOT" "${partition2}"
-    mkfs.ext4 "${partition3}"
+    mkfs.ext4 -L ROOT "${partition3}"
    mount -t ext4 "${partition3}" /mnt
 elif [[ "${FS}" == "luks" ]]; then
-    mkfs.vfat -F32 "${partition2}"
+    mkfs.vfat -F32 -n "EFIBOOT" "${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 "${partition3}"
+    mkfs.btrfs -L ROOT "${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 -U "${BOOT_UUID}" /mnt/boot/
+mount -t vfat -L EFIBOOT /mnt/boot/

 if ! grep -qs '/mnt' /proc/mounts; then
    echo "Drive is not mounted can not continue"
@ -438,8 +435,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 -U /mnt >> /mnt/etc/fstab
-echo "
+genfstab -L /mnt >> /mnt/etc/fstab
+echo " 
  Generated /etc/fstab:
 "
 cat /mnt/etc/fstab
@ -478,14 +475,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
@ -507,7 +504,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
@ -529,9 +526,6 @@ 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
@ -578,7 +572,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"
--- a/core/tabs/system-setup/arch/virtualization.sh
+++ b/core/tabs/system-setup/arch/virtualization.sh
@ -1,104 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-installQEMUDesktop() {
-    if ! command_exists qemu-img; then
-        printf "%b\n" "${YELLOW}Installing QEMU.${RC}"
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qemu-desktop
-    else
-        printf "%b\n" "${GREEN}QEMU is already installed.${RC}"
-    fi
-    checkKVM
-}
-
-installQEMUEmulators() {
-    if ! "$PACKAGER" -Q | grep -q "qemu-emulators-full "; then
-        printf "%b\n" "${YELLOW}Installing QEMU-Emulators.${RC}"
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qemu-emulators-full swtpm
-    else
-        printf "%b\n" "${GREEN}QEMU-Emulators already installed.${RC}"
-    fi
-}
-
-installVirtManager() {
-    if ! command_exists virt-manager; then
-        printf "%b\n" "${YELLOW}Installing Virt-Manager.${RC}"
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm virt-manager
-    else
-        printf "%b\n" "${GREEN}Virt-Manager already installed.${RC}"
-    fi
-}
-
-checkKVM() {
-    if [ ! -e "/dev/kvm" ]; then
-        printf "%b\n" "${RED}KVM is not available. Make sure you have CPU virtualization support enabled in your BIOS/UEFI settings. Please refer https://wiki.archlinux.org/title/KVM for more information.${RC}"
-    else
-        "$ESCALATION_TOOL" usermod "$USER" -aG kvm
-    fi
-}
-
-setupLibvirt() {
-    printf "%b\n" "${YELLOW}Configuring Libvirt.${RC}"
-    if "$PACKAGER" -Q | grep -q "iptables "; then
-        "$ESCALATION_TOOL" "$PACKAGER" -Rdd --noconfirm iptables
-    fi
-
-    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dnsmasq iptables-nft
-    "$ESCALATION_TOOL" sed -i 's/^#\?firewall_backend\s*=\s*".*"/firewall_backend = "iptables"/' "/etc/libvirt/network.conf"
-
-    if systemctl is-active --quiet polkit; then
-        "$ESCALATION_TOOL" sed -i 's/^#\?auth_unix_ro\s*=\s*".*"/auth_unix_ro = "polkit"/' "/etc/libvirt/libvirtd.conf"
-        "$ESCALATION_TOOL" sed -i 's/^#\?auth_unix_rw\s*=\s*".*"/auth_unix_rw = "polkit"/' "/etc/libvirt/libvirtd.conf"
-    fi
-
-    "$ESCALATION_TOOL" usermod "$USER" -aG libvirt
-
-    for value in libvirt libvirt_guest; do
-        if ! grep -wq "$value" /etc/nsswitch.conf; then
-            "$ESCALATION_TOOL" sed -i "/^hosts:/ s/$/ ${value}/" /etc/nsswitch.conf
-        fi
-    done
-
-    "$ESCALATION_TOOL" systemctl enable --now libvirtd.service
-    "$ESCALATION_TOOL" virsh net-autostart default
-
-    checkKVM
-}
-
-installLibvirt() {
-    if ! command_exists libvirtd; then
-        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libvirt dmidecode
-    else
-        printf "%b\n" "${GREEN}Libvirt is already installed.${RC}"
-    fi
-    setupLibvirt
-}
-
-main() {
-    printf "%b\n" "${YELLOW}Choose what to install:${RC}"
-    printf "%b\n" "1. ${YELLOW}QEMU${RC}"
-    printf "%b\n" "2. ${YELLOW}QEMU-Emulators ( Extended architectures )${RC}"
-    printf "%b\n" "3. ${YELLOW}Libvirt${RC}"
-    printf "%b\n" "4. ${YELLOW}Virtual-Manager${RC}"
-    printf "%b\n" "5. ${YELLOW}All${RC}"
-    printf "%b" "Enter your choice [1-5]: "
-    read -r CHOICE
-    case "$CHOICE" in
-        1) installQEMUDesktop ;;
-        2) installQEMUEmulators ;;
-        3) installLibvirt ;;
-        4) installVirtManager ;;
-        5)
-            installQEMUDesktop
-            installQEMUEmulators
-            installLibvirt
-            installVirtManager
-            ;;
-        *) printf "%b\n" "${RED}Invalid choice.${RC}" && exit 1 ;;
-    esac
-}
-
-checkEnv
-checkEscalationTool
-main
--- a/core/tabs/system-setup/compile-setup.sh
+++ b/core/tabs/system-setup/compile-setup.sh
@ -37,9 +37,6 @@ installDepend() {
            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install $DEPENDENCIES $COMPILEDEPS
            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add build-base multitail tar tree trash-cli unzip cmake jq
-            ;;
        *)
            "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
            ;;
--- a/core/tabs/system-setup/fedora/fedora-btrfs-assistant.sh
+++ b/core/tabs/system-setup/fedora/fedora-btrfs-assistant.sh
@ -1,168 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-# This script automates the installation and root and home snapshot configuration of Snapper and installs Grub-Btrfs on Fedora.
-# Also installs python3-dnf-plugin-snapper package for automatic snapshots after dnf commands.
-
-# Install Btrfs-Assistant/snapper and dependencies
-installBtrfsStack() {
-    if ! command_exists btrfs-assistant; then
-        printf "%b\n" "${YELLOW}==========================================${RC}"
-        printf "%b\n" "${YELLOW}Installing Btrfs Assistant with snapper...${RC}"
-        printf "%b\n" "${YELLOW}==========================================${RC}"
-        case "$PACKAGER" in
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y btrfs-assistant python3-dnf-plugin-snapper
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Btrfs Assistant is already installed.${RC}"
-    fi
-}
-
-# Create first snapper config for root and home and create new manual snapshots
-configureSnapper() {
-    printf "%b\n" "${YELLOW}===========================================================================${RC}"
-    printf "%b\n" "${YELLOW}Creating snapper root(/) and /home config and taking the first snapshots...${RC}"
-    printf "%b\n" "${YELLOW}===========================================================================${RC}"
-    "$ESCALATION_TOOL" snapper -c home create-config /home && "$ESCALATION_TOOL" snapper -c home create --description "First home Snapshot"
-    "$ESCALATION_TOOL" snapper -c root create-config / && "$ESCALATION_TOOL" snapper -c root create --description "First root Snapshot"
-    printf "%b\n" "${YELLOW}Updating timeline settings...${RC}"
-    # Modifyling default timeline root config
-    "$ESCALATION_TOOL" sed -i'' '
-        s/^TIMELINE_LIMIT_HOURLY="[^"]*"/TIMELINE_LIMIT_HOURLY="1"/;
-        s/^TIMELINE_LIMIT_DAILY="[^"]*"/TIMELINE_LIMIT_DAILY="2"/;
-        s/^TIMELINE_LIMIT_WEEKLY="[^"]*"/TIMELINE_LIMIT_WEEKLY="1"/;
-        s/^TIMELINE_LIMIT_MONTHLY="[^"]*"/TIMELINE_LIMIT_MONTHLY="0"/;
-        s/^TIMELINE_LIMIT_YEARLY="[^"]*"/TIMELINE_LIMIT_YEARLY="0"/
-    ' /etc/snapper/configs/root
-    # Modifyling default timeline for home config
-    "$ESCALATION_TOOL" sed -i'' '
-        s/^TIMELINE_LIMIT_HOURLY="[^"]*"/TIMELINE_LIMIT_HOURLY="2"/;
-        s/^TIMELINE_LIMIT_DAILY="[^"]*"/TIMELINE_LIMIT_DAILY="1"/;
-        s/^TIMELINE_LIMIT_WEEKLY="[^"]*"/TIMELINE_LIMIT_WEEKLY="0"/;
-        s/^TIMELINE_LIMIT_MONTHLY="[^"]*"/TIMELINE_LIMIT_MONTHLY="1"/;
-        s/^TIMELINE_LIMIT_YEARLY="[^"]*"/TIMELINE_LIMIT_YEARLY="0"/
-    ' /etc/snapper/configs/home
-    printf "%b\n" "${GREEN}Snapper configs and first snapshots created.${RC}"
-}
-
-# Starting services
-serviceStartEnable() {
-    printf "%b\n" "${YELLOW}==================================================================================${RC}"
-    printf "%b\n" "${YELLOW}Starting and enabling snapper-timeline.timer and snapper-cleanup.timer services...${RC}"
-    printf "%b\n" "${YELLOW}==================================================================================${RC}"
-    "$ESCALATION_TOOL" systemctl enable --now snapper-timeline.timer
-    "$ESCALATION_TOOL" systemctl enable --now snapper-cleanup.timer
-    printf "%b\n" "${GREEN}Snapper services started and enabled.${RC}"
-}
-
-# Ask user if they want to install grub-btrfs
-askInstallGrubBtrfs() {
-    printf "%b\n" "${YELLOW}=====================================${RC}"
-    printf "%b\n" "${YELLOW}(optional) grub-btrfs installation...${RC}"
-    printf "%b\n" "${YELLOW}=====================================${RC}"
-    printf "%b\n" "${YELLOW}You can skip installing grub-btrfs and use only Btrfs Assistant GUI or snapper CLI.${RC}"
-    printf "%b\n" "${CYAN}Notice: grub-btrfs may cause problems with booting into snapshots and other OSes on systems with secure boot/tpm. You will be asked to apply mitigation for this issue in next step.${RC}"
-
-    while true; do
-        printf "%b" "${YELLOW}Do you want to install grub-btrfs? Press (y) for yes, (n) for no, (f) to apply tpm mitigation to already installed grub-btrfs: ${RC}"
-        read -r response
-        case "$response" in
-            [yY]*)
-                installGrubBtrfs
-                break
-                ;;
-            [nN]*)
-                printf "%b\n" "${GREEN}Skipping grub-btrfs installation.${RC}"
-                break
-                ;;
-            [fF]*)
-                mitigateTpmError
-                break
-                ;;
-            *)
-                printf "%b\n" "${RED}Invalid input. Please enter 'y' for yes, 'n' for no, or (f) to apply tpm mitigation to already installed grub-btrfs.${RC}"
-                ;;
-        esac
-    done
-}
-
-# Install grub-btrfs
-installGrubBtrfs() {
-    # Check if the grub-btrfs dir exists before attempting to clone into it.
-    printf "%b\n" "${YELLOW}Downloading grub-btrfs and installing dependencies...${RC}"
-    if [ -d "$HOME/grub-btrfs" ]; then
-        rm -rf "$HOME/grub-btrfs"
-    fi
-    "$ESCALATION_TOOL" "$PACKAGER" install -y make git inotify-tools
-    cd "$HOME" && git clone https://github.com/Antynea/grub-btrfs
-    printf "%b\n" "${YELLOW}Installing grub-btrfs...${RC}"
-    cd "$HOME/grub-btrfs"
-    printf "%b\n" "${YELLOW}Modifying grub-btrfs configuration for Fedora...${RC}"
-    sed -i'' '/#GRUB_BTRFS_SNAPSHOT_KERNEL/a GRUB_BTRFS_SNAPSHOT_KERNEL_PARAMETERS="systemd.volatile=state"' config
-    sed -i'' '/#GRUB_BTRFS_GRUB_DIRNAME/a GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"' config
-    sed -i'' '/#GRUB_BTRFS_MKCONFIG=/a GRUB_BTRFS_MKCONFIG=/sbin/grub2-mkconfig' config
-    sed -i'' '/#GRUB_BTRFS_SCRIPT_CHECK=/a GRUB_BTRFS_SCRIPT_CHECK=grub2-script-check' config
-    "$ESCALATION_TOOL" make install
-    printf "%b\n" "${YELLOW}Updating grub configuration and enabling grub-btrfsd service...${RC}"
-    "$ESCALATION_TOOL" grub2-mkconfig -o /boot/grub2/grub.cfg && "$ESCALATION_TOOL" systemctl enable --now grub-btrfsd.service
-    printf "%b\n" "${YELLOW}Cleaning up installation files...${RC}"
-    cd .. && rm -rf "$HOME/grub-btrfs"
-    printf "%b\n" "${GREEN}Grub-btrfs installed and service enabled.${RC}"
-    printf "%b\n" "${CYAN}Notice: To perform a system recovery via grub-btrfs, perform a restore operation with Btrfs Assistant GUI after booting into the snapshot.${RC}"
-    mitigateTpmError
-}
-
-mitigateTpmError() {
-    printf "%b\n" "${YELLOW}===============================================${RC}"
-    printf "%b\n" "${YELLOW}Mitigation for 'tpm.c:150:unknown TPM error'...${RC}"
-    printf "%b\n" "${YELLOW}===============================================${RC}"
-    printf "%b\n" "${YELLOW}Some systems with secure boot/tpm may encounter 'tpm.c:150:unknown TPM error' when booting into snapshots.${RC}"
-    printf "%b\n" "${YELLOW}If you encounter this issue, you can come back later and apply this mitigation or you can apply it now.${RC}"
-    while true; do
-        printf "%b\n" "${YELLOW}Do you want to apply the TPM error mitigation? (y/n): ${RC}"
-        read -r response
-        case "$response" in
-            [yY]*)
-                printf "%b\n" "${YELLOW}Creating /etc/grub.d/02_tpm file...${RC}"
-                echo '#!/bin/sh' | "$ESCALATION_TOOL" tee /etc/grub.d/02_tpm > /dev/null
-                echo 'echo "rmmod tpm"' | "$ESCALATION_TOOL" tee -a /etc/grub.d/02_tpm > /dev/null
-                "$ESCALATION_TOOL" chmod +x /etc/grub.d/02_tpm # makes the file executable
-                "$ESCALATION_TOOL" grub2-mkconfig -o /boot/grub2/grub.cfg # updates grub config
-                printf "%b\n" "${GREEN}Mitigation applied and grub config updated.${RC}"
-                break
-                ;;
-            [nN]*)
-                printf "%b\n" "${GREEN}Skipping TPM error mitigation.${RC}"
-                break
-                ;;
-            *)
-                printf "%b\n" "${RED}Invalid input. Please enter 'y' for yes or 'n' for no.${RC}"
-                ;;
-        esac
-    done
-}
-
-# Post install information
-someNotices() {
-    printf "%b\n" "${YELLOW}================================NOTICES================================${RC}"
-    printf "%b\n" "${YELLOW}Notice: You can manage snapshots from GUI with Btrfs Assistant or CLI with snapper.${RC}"
-    printf "%b\n" "${YELLOW}Notice: You may change (Hourly, daily, weekly, monthly, yearly) timeline settings with Btrfs Assistant GUI.${RC}"
-    printf "%b\n" "${RED}Notice: If you used the default Fedora disk partitioning during OS installation, the /boot configured as an separate EXT4 partition. Therefore, it cannot be included in root snapshots. Backup separately...${RC}"
-    printf "%b\n" "${YELLOW}================================NOTICES================================${RC}"
-    printf "%b\n" "${GREEN}Setup process completed.${RC}"
-}
-
-checkEnv
-checkEscalationTool
-installBtrfsStack
-configureSnapper
-serviceStartEnable
-askInstallGrubBtrfs
-someNotices
--- a/core/tabs/system-setup/fedora/fedora-upgrade.sh
+++ b/core/tabs/system-setup/fedora/fedora-upgrade.sh
@ -1,83 +0,0 @@
-#!/bin/sh -e
-
-. ../../common-script.sh
-
-current_version=$(rpm -E '%{fedora}')
-next_version=$((current_version + 1))
-
-update() {
-    printf "%b\n" "${YELLOW}Make sure your system is fully updated; if not, update it first and reboot once.${RC}"
-    printf "%b\n" "${CYAN}Your current Fedora version is $current_version.${RC}"
-    printf "%b\n" "${CYAN}The next available version is $next_version.${RC}"
-    
-    printf "%b\n" "${YELLOW}Do you want to update to $next_version? (y/n): ${RC}"  
-    read -r response
-    
-    case "$response" in
-        y|Y)
-            printf "%b\n" "${CYAN}Preparing to update to $next_version...${RC}"
-        
-            if ! "$ESCALATION_TOOL" "$PACKAGER" install dnf-plugin-system-upgrade -y; then
-                printf "%b\n" "${RED}Failed to install dnf-plugin-system-upgrade.${RC}"
-                exit 1
-            fi
-        
-            if ! "$ESCALATION_TOOL" "$PACKAGER" system-upgrade download --releasever="$next_version" -y ; then
-                printf "%b\n" "${RED}Failed to download the upgrade packages.${RC}"
-                exit 1
-            fi
-
-            printf "%b\n" "${YELLOW}Do you want to reboot now to apply the upgrade? (y/n): ${RC}"
-            read -r reboot_response
-
-            case "$reboot_response" in
-                y|Y)
-                    printf "%b\n" "${YELLOW}Rebooting to apply the upgrade...${RC}"
-                    "$ESCALATION_TOOL" "$PACKAGER" system-upgrade reboot
-                    ;;
-                *)
-                    printf "%b\n" "${YELLOW}You can reboot later to apply the upgrade.${RC}"
-                    ;;
-            esac
-            ;;
-        *)
-            printf "%b\n" "${RED}No upgrade performed.${RC}"
-            ;;
-    esac
-}
-
-post_upgrade() {
-    printf "%b\n" "${YELLOW}Running post-upgrade tasks...${RC}"
-    
-    case "$PACKAGER" in
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" autoremove  
-            "$ESCALATION_TOOL" "$PACKAGER" distro-sync -y
-            ;;
-        *)
-            printf "%b\n" "${RED}Unsupported package manager: $PACKAGER.${RC}"
-            exit 1
-            ;;
-    esac
-}
-
-checkEnv
-checkEscalationTool
-
-printf "%b\n" "${YELLOW}Select an option:${RC}"
-printf "%b\n" "${GREEN}1. Upgrade to the next Fedora version${RC}"
-printf "%b\n" "${GREEN}2. Run post-upgrade tasks${RC}"
-read -r choice
-
-case "$choice" in
-    1)
-        update
-        ;;
-    2)
-        post_upgrade
-        ;;
-    *)
-        printf "%b\n" "${RED}Invalid option. Please select 1 or 2.${RC}"
-        exit 1
-        ;;
-esac
--- a/core/tabs/system-setup/gaming-setup.sh
+++ b/core/tabs/system-setup/gaming-setup.sh
@ -21,12 +21,12 @@ installDepend() {
                alsa-utils alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib giflib lib32-giflib libpng lib32-libpng \
                libldap lib32-libldap openal lib32-openal libxcomposite lib32-libxcomposite libxinerama lib32-libxinerama \
                ncurses lib32-ncurses vulkan-icd-loader lib32-vulkan-icd-loader ocl-icd lib32-ocl-icd libva lib32-libva \
-                gst-plugins-base-libs lib32-gst-plugins-base-libs sdl2 lib32-sdl2 v4l-utils lib32-v4l-utils sqlite lib32-sqlite"
+                gst-plugins-base-libs lib32-gst-plugins-base-libs sdl2"

            $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS
            ;;
        apt-get|nala)
-            DISTRO_DEPS="libasound2-plugins:i386 libsdl2-2.0-0:i386 libdbus-1-3:i386 libsqlite3-0:i386 wine64 wine32"
+            DISTRO_DEPS="libasound2 libsdl2 wine64 wine32"

            "$ESCALATION_TOOL" "$PACKAGER" update
            "$ESCALATION_TOOL" dpkg --add-architecture i386
@ -36,7 +36,7 @@ installDepend() {
            "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS
            ;;
        dnf)
-            if [ "$(rpm -E %fedora)" -le 41 ]; then
+            if [ "$(rpm -E %fedora)" -le 41 ]; then 
                "$ESCALATION_TOOL" "$PACKAGER" install ffmpeg ffmpeg-libs -y
                "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
            else
@ -50,8 +50,7 @@ installDepend() {
            "$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES
            ;;
        *)
-            printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
-            exit 1
+            "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
            ;;
    esac
 }
@ -70,7 +69,7 @@ installAdditionalDepend() {

            version_no_v=$(echo "$version" | tr -d v)
            curl -sSLo "lutris_${version_no_v}_all.deb" "https://github.com/lutris/lutris/releases/download/${version}/lutris_${version_no_v}_all.deb"
-
+            
            printf "%b\n" "${YELLOW}Installing Lutris...${RC}"
            "$ESCALATION_TOOL" "$PACKAGER" install ./lutris_"${version_no_v}"_all.deb

@ -96,8 +95,6 @@ installAdditionalDepend() {
            "$ESCALATION_TOOL" "$PACKAGER" -n install $DISTRO_DEPS
            ;;
        *)
-            printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
-            exit 1
            ;;
    esac
 }
--- a/core/tabs/system-setup/system-cleanup.sh
+++ b/core/tabs/system-setup/system-cleanup.sh
@ -1,15 +1,16 @@
 #!/bin/sh -e

 . ../common-script.sh
-. ../common-service-script.sh

 cleanup_system() {
    printf "%b\n" "${YELLOW}Performing system cleanup...${RC}"
    case "$PACKAGER" in
        apt-get|nala)
            "$ESCALATION_TOOL" "$PACKAGER" clean
-            "$ESCALATION_TOOL" "$PACKAGER" autoremove -y 
+            "$ESCALATION_TOOL" "$PACKAGER" autoremove -y
+            "$ESCALATION_TOOL" "$PACKAGER" autoclean
            "$ESCALATION_TOOL" du -h /var/cache/apt
+            "$ESCALATION_TOOL" "$PACKAGER" clean
            ;;
        zypper)
            "$ESCALATION_TOOL" "$PACKAGER" clean -a
@ -24,28 +25,18 @@ cleanup_system() {
            "$ESCALATION_TOOL" "$PACKAGER" -Sc --noconfirm
            "$ESCALATION_TOOL" "$PACKAGER" -Rns $(pacman -Qtdq) --noconfirm > /dev/null 2>&1
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" cache clean
-            ;;
        *)
-            printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}. Skipping.${RC}"
+            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+            return 1
            ;;
    esac
 }

 common_cleanup() {
-    if [ -d /var/tmp ]; then
-        "$ESCALATION_TOOL" find /var/tmp -type f -atime +5 -delete
-    fi
-    if [ -d /tmp ]; then
-        "$ESCALATION_TOOL" find /tmp -type f -atime +5 -delete
-    fi
-    if [ -d /var/log ]; then
-        "$ESCALATION_TOOL" find /var/log -type f -name "*.log" -exec truncate -s 0 {} \;
-    fi
-    if [ "$INIT_MANAGER" = "systemctl" ]; then
-        "$ESCALATION_TOOL" journalctl --vacuum-time=3d
-    fi
+    "$ESCALATION_TOOL" find /var/tmp -type f -atime +5 -delete
+    "$ESCALATION_TOOL" find /tmp -type f -atime +5 -delete
+    "$ESCALATION_TOOL" find /var/log -type f -name "*.log" -exec truncate -s 0 {} \;
+    "$ESCALATION_TOOL" journalctl --vacuum-time=3d
 }

 clean_data() {
@ -54,12 +45,8 @@ clean_data() {
    case $clean_response in
        y|Y)
            printf "%b\n" "${YELLOW}Cleaning up old cache files and emptying trash...${RC}"
-            if [ -d "$HOME/.cache" ]; then
-                find "$HOME/.cache/" -type f -atime +5 -delete
-            fi
-            if [ -d "$HOME/.local/share/Trash" ]; then
-                find "$HOME/.local/share/Trash" -mindepth 1 -delete
-            fi
+            find "$HOME/.cache/" -type f -atime +5 -delete
+            find "$HOME/.local/share/Trash" -mindepth 1 -delete
            printf "%b\n" "${GREEN}Cache and trash cleanup completed.${RC}"
            ;;
        *)
--- a/core/tabs/system-setup/system-update.sh
+++ b/core/tabs/system-setup/system-update.sh
@ -48,9 +48,6 @@ fastUpdate() {
            "$ESCALATION_TOOL" "$PACKAGER" ref
            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" update
-            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
            exit 1
@ -77,9 +74,6 @@ updateSystem() {
            "$ESCALATION_TOOL" "$PACKAGER" ref
            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" upgrade
-            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
            exit 1
--- a/core/tabs/system-setup/tab_data.toml
+++ b/core/tabs/system-setup/tab_data.toml
@ -1,4 +1,5 @@
 name = "System Setup"
+multi_selectable = false

 [[data]]
 name = "Arch Linux"
@ -13,40 +14,16 @@ name = "Arch Server Setup"
 description = "This command installs a minimal arch server setup under 5 minutes."
 script = "arch/server-setup.sh"
 task_list = "SI D"
-multi_select = false
-
-[[data.entries]]
-name ="Linux Neptune for SteamDeck"
-description = "Valve's fork of Linux Kernel for the SteamDeck"
-script = "arch/linux-neptune.sh"
-task_list = "I PFM K"
-
-[[data.entries.preconditions]]
-matches = true
-data = { file = "/sys/devices/virtual/dmi/id/board_vendor" }
-values = [ "Valve" ]
-
-[[data.entries]]
-name = "Nvidia Drivers && Hardware Acceleration"
-description = "This script installs and configures nvidia drivers with Hardware Acceleration."
-script = "arch/nvidia-drivers.sh"
-task_list = "I FM SS"

 [[data.entries]]
 name = "Paru AUR Helper"
-description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
+description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
 script = "arch/paru-setup.sh"
 task_list = "I"

-[[data.entries]]
-name = "Virtualization"
-description = "QEMU, Libvirt, Virt-Manager installation and configuration."
-script = "arch/virtualization.sh"
-task_list = "FM I SS RP"
-
 [[data.entries]]
 name = "Yay AUR Helper"
-description = "Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
+description = "Yet Another Yogurt - An AUR Helper Written in Go.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
 script = "arch/yay-setup.sh"
 task_list = "I"

@ -78,33 +55,16 @@ task_list = "I"

 [[data.entries]]
 name = "RPM Fusion"
-description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship. That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit. For more information visit: https://rpmfusion.org/"
+description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship.\nThat software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit.\nFor more information visit: https://rpmfusion.org/"
 script = "fedora/rpm-fusion-setup.sh"
 task_list = "MP"

-[[data.entries]]
-name = "Upgrade to a New Fedora Release"
-description = "Upgrades system to the next Fedora release"
-script = "fedora/fedora-upgrade.sh"
-task_list = "MP"
-
 [[data.entries]]
 name = "Virtualization"
 description = "Enables Virtualization through dnf"
 script = "fedora/virtualization.sh"
 task_list = "I"

-[[data.entries]]
-name = "Btrfs Assistant, Snapper Config, grub-btrfs"
-description = "Installs Btrfs Assistant, Snapper, dnf snapper plugin and takes the first root(/) and /home snapshots. Enables snapper-timeline and snapper-cleanup services. Installs Grub-Btrfs. Notice: To perform a system recovery via grub-btrfs, perform a restore operation with Btrfs Assistant GUI after booting into the snapshot. Notice: If you used the default Fedora disk partitioning during OS installation, the /boot configured as an separate EXT4 partition. Therefore, it cannot be included in root snapshots. Backup separately."
-script = "fedora/fedora-btrfs-assistant.sh"
-task_list = "I PFM SS"
-
-[[data.preconditions]]
-matches = true
-data = "command_exists"
-values = [ "btrfs" ]
-
 [[data]]
 name = "Build Prerequisites"
 description = "This script is designed to handle the installation of various software dependencies across different Linux distributions"
@ -116,14 +76,12 @@ name = "Full System Cleanup"
 description = "This script is designed to remove unnecessary packages, clean old cache files, remove temporary files, and to empty the trash."
 script = "system-cleanup.sh"
 task_list = "RP PFM"
-multi_select = false

 [[data]]
 name = "Full System Update"
 description = "This command updates your system to the latest packages available for your distro"
 script = "system-update.sh"
 task_list = "PFM"
-multi_select = false

 [[data]]
 name = "Gaming Dependencies"
--- a/core/tabs/utils/bluetooth-control.sh
+++ b/core/tabs/utils/bluetooth-control.sh
@ -1,7 +1,6 @@
 #!/bin/sh -e

 . ../common-script.sh
-. ../common-service-script.sh

 # Function to check Bluez is installed
 setupBluetooth() {
@ -11,9 +10,6 @@ setupBluetooth() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm bluez-utils
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add bluez
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y bluez
                ;;
@ -22,7 +18,15 @@ setupBluetooth() {
        printf "%b\n" "${GREEN}Bluez is already installed.${RC}"
    fi

-    startService bluetooth
+    # Check if bluetooth service is running
+    if ! systemctl is-active --quiet bluetooth; then
+        printf "%b\n" "${YELLOW}Bluetooth service is not running. Starting it now...${RC}"
+        "$ESCALATION_TOOL" systemctl start bluetooth
+        
+        if systemctl is-active --quiet bluetooth; then
+            printf "%b\n" "${GREEN}Bluetooth service started successfully.${RC}"
+        fi
+    fi
 }

 # Function to display the main menu
--- a/core/tabs/utils/create-bootable-usb.sh
+++ b/core/tabs/utils/create-bootable-usb.sh
@ -2,7 +2,12 @@

 . ../common-script.sh  

-CONFIGURATION_URL="https://github.com/quickemu-project/quickget_configs/releases/download/daily/quickget_data.json"
+# Function to display usage instructions
+usage() {
+    printf "%b\n" "${RED} Usage: $0 ${RC}"
+    printf "%b\n" "No arguments needed. The script will prompt for ISO path and USB device."
+    exit 1
+}

 # Function to display all available block devices
 list_devices() {
@ -12,26 +17,53 @@ list_devices() {
    printf "\n"
 }

-# shellcheck disable=SC2086
-installDependencies() {
-    DEPENDENCIES="xz gzip bzip2 jq"
-    if ! command_exists ${DEPENDENCIES}; then
-        printf "%b\n" "${YELLOW}Installing dependencies...${RC}"
-        case "${PACKAGER}" in
-            apt-get|nala)
-                "${ESCALATION_TOOL}" "${PACKAGER}" install -y xz-utils gzip bzip2 jq;;
-            dnf|zypper)
-                "${ESCALATION_TOOL}" "${PACKAGER}" install -y ${DEPENDENCIES};;
-            pacman)
-                "${ESCALATION_TOOL}" "${PACKAGER}" -S --noconfirm --needed ${DEPENDENCIES};;
-            apk)
-                "${ESCALATION_TOOL}" "${PACKAGER}" add ${DEPENDENCIES};;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager.${RC}"
-                exit 1
-                ;;
-        esac
+# Function to fetch the latest Arch Linux ISO
+fetch_arch_latest_iso() {
+    ARCH_BASE_URL="https://archive.archlinux.org/iso/"
+    ARCH_LATEST=$(curl -s "$ARCH_BASE_URL" | grep -oP '(?<=href=")[0-9]{4}\.[0-9]{2}\.[0-9]{2}(?=/)' | sort -V | tail -1)
+    ARCH_URL="${ARCH_BASE_URL}${ARCH_LATEST}/archlinux-${ARCH_LATEST}-x86_64.iso"
+    printf "%b\n" "${GREEN} Selected Arch Linux (latest) ISO URL: ${RC} $ARCH_URL"
+}
+
+# Function to fetch older Arch Linux ISOs and display in a table format
+fetch_arch_older_isos() {
+    ARCH_BASE_URL="https://archive.archlinux.org/iso/"
+    ARCH_VERSIONS=$(curl -s "$ARCH_BASE_URL" | grep -oP '(?<=href=")[0-9]{4}\.[0-9]{2}\.[0-9]{2}(?=/)' | sort -V)
+
+    # Filter versions to include only those from 2017-04-01 and later
+    MIN_DATE="2017.04.01"
+    ARCH_VERSIONS=$(echo "$ARCH_VERSIONS" | awk -v min_date="$MIN_DATE" '$0 >= min_date')
+
+    if [ -z "$ARCH_VERSIONS" ]; then
+        printf "%b\n" "${RED}No Arch Linux versions found from ${MIN_DATE} onwards.${RC}"
+        exit 1
    fi
+
+    printf "%b\n" "${YELLOW}Available Arch Linux versions from ${MIN_DATE} onwards:${RC}"
+    
+    COUNTER=1
+    ROW_ITEMS=6  # Number of versions to show per row
+    for VERSION in $ARCH_VERSIONS; do
+        printf "%-5s${YELLOW}%-15s ${RC}" "$COUNTER)" "$VERSION"
+        
+        if [ $(( COUNTER % ROW_ITEMS )) -eq 0 ]; then
+            printf "\n"  # New line after every 6 versions
+        fi
+        
+        COUNTER=$((COUNTER + 1))
+    done
+    printf "\n"  # New line after the last row
+    printf "%b" "Select an Arch Linux version (1-$((COUNTER - 1))): "
+    read -r ARCH_OPTION
+    ARCH_DIR=$(echo "$ARCH_VERSIONS" | sed -n "${ARCH_OPTION}p")
+    ARCH_URL="${ARCH_BASE_URL}${ARCH_DIR}/archlinux-${ARCH_DIR}-x86_64.iso"
+    printf "%b\n" "${GREEN}Selected Arch Linux (older) ISO URL: $ARCH_URL${RC}"
+}
+
+# Function to fetch the latest Debian Linux ISO
+fetch_debian_latest_iso() {
+    DEBIAN_URL=$(curl -s https://www.debian.org/distrib/netinst | grep -oP '(?<=href=")[^"]+debian-[0-9.]+-amd64-netinst.iso(?=")' | head -1)
+    printf "%b\n" "${GREEN} Selected Debian Linux (latest) ISO URL: ${RC} $DEBIAN_URL"
 }

 # Function to ask whether to use local or online ISO
@ -45,7 +77,7 @@ choose_iso_source() {

    case $ISO_SOURCE_OPTION in
        1)
-            get_online_iso
+            fetch_iso_urls  # Call the function to fetch online ISO URLs
            ;;
        2)
            printf "Enter the path to the already downloaded ISO file: "
@ -62,156 +94,45 @@ choose_iso_source() {
    esac
 }

-decompress_iso() {
-    printf "%b\n" "${YELLOW}Decompressing ISO file...${RC}"
-    case "${ISO_ARCHIVE_FORMAT}" in
-        xz)
-            xz -d "${ISO_PATH}"
-            ISO_PATH="$(echo "${ISO_PATH}" | sed 's/\.xz//')";;
-        gz)
-            gzip -d "${ISO_PATH}"
-            ISO_PATH="$(echo "${ISO_PATH}" | sed 's/\.gz//')";;
-        bz2)
-            bzip2 -d "${ISO_PATH}"
-            ISO_PATH="$(echo "${ISO_PATH}" | sed 's/\.bz2//')";;
-        *) 
-            printf "%b\n" "${RED}Unsupported archive format. Try manually decompressing the ISO and choosing it as a local file instead.${RC}"
+# Function to fetch ISO URLs
+fetch_iso_urls() {
+    clear
+    printf "%b\n" "${YELLOW}Available ISOs for download:${RC}"
+    printf "%b\n" "1) Arch Linux (latest)"
+    printf "%b\n" "2) Arch Linux (older versions)"
+    printf "%b\n" "3) Debian Linux (latest)"
+    printf "\n"
+    printf "%b" "Select the ISO you want to download (1-3): "
+    read -r ISO_OPTION
+
+    case $ISO_OPTION in
+        1)
+            fetch_arch_latest_iso
+            ISO_URL=$ARCH_URL
+            ;;
+        2)
+            fetch_arch_older_isos
+            ISO_URL=$ARCH_URL
+            ;;
+        3)
+            fetch_debian_latest_iso
+            ISO_URL=$DEBIAN_URL
+            ;;
+        *)
+            printf "%b\n" "${RED}Invalid option selected.${RC}"
            exit 1
            ;;
    esac

-    printf "%b\n" "${GREEN}ISO file decompressed successfully.${RC}"
-}
-
-check_hash() {
-    case "${#ISO_CHECKSUM}" in
-        32) HASH_ALGO="md5sum";;
-        40) HASH_ALGO="sha1sum";;
-        64) HASH_ALGO="sha256sum";;
-        128) HASH_ALGO="sha512sum";;
-        *) printf "%b\n" "${RED}Invalid checksum length. Skipping checksum verification.${RC}"
-            return;;
-    esac
-    printf "%b\n" "Checking ISO integrity using ${HASH_ALGO}..."
-    if ! echo "${ISO_CHECKSUM} ${ISO_PATH}" | "${HASH_ALGO}" --check --status; then
-        printf "%b\n" "${RED}Checksum verification failed.${RC}"
-        exit 1
-    else
-        printf "%b\n" "${GREEN}Checksum verification successful.${RC}"
-    fi
-}
-
-download_iso() {
-    printf "\n%b\n" "${YELLOW}Found URL: ${ISO_URL}${RC}"
-    printf "%b\n" "${YELLOW}Downloading ISO to ${ISO_PATH}...${RC}"
-    if ! curl -L -o "$ISO_PATH" "$ISO_URL"; then
+    ISO_PATH=$(basename "$ISO_URL")
+    printf "%b\n" "${YELLOW}Downloading ISO...${RC}"
+    curl -L -o "$ISO_PATH" "$ISO_URL"
+    if [ $? -ne 0 ]; then
        printf "%b\n" "${RED}Failed to download the ISO file.${RC}"
        exit 1
    fi
 }

-get_architecture() {
-    printf "%b\n" "${YELLOW}Select the architecture of the ISO to flash${RC}"
-    printf "%b\n" "1) x86_64"
-    printf "%b\n" "2) AArch64"
-    printf "%b\n" "3) riscv64"
-    printf "%b" "Select an option (1-3): "
-    read -r ARCH
-    case "${ARCH}" in
-        1) ARCH="x86_64";;
-        2) ARCH="aarch64";;
-        3) ARCH="riscv64";;
-        *)
-            printf "%b\n" "${RED}Invalid architecture selected. ${RC}"
-            exit 1
-            ;;
-    esac
-}
-
-comma_delimited_list() {
-    echo "${1}" | tr '\n' ',' | sed 's/,/, /g; s/, $//'
-}
-
-get_online_iso() {
-    get_architecture
-    printf "%b\n" "${YELLOW}Fetching available operating systems...${RC}"
-    clear
-
-    # Download available operating systems, filter to to those that match requirements
-    # Remove entries with more than 1 ISO or any other medium, they could cause issues
-    OS_JSON="$(curl -L -s "$CONFIGURATION_URL" | jq -c "[.[] | \
-        .releases |= map(select( \
-        (.arch // \"x86_64\") == "\"${ARCH}\"" \
-        and (.iso | length == 1) and (.iso[0] | has(\"web\")) \
-        and .img == null and .fixed_iso == null and .floppy == null and .disk_images == null)) \
-        | select(.releases | length > 0)]")"
-
-    if echo "${OS_JSON}" | jq -e 'length == 0' >/dev/null; then
-        printf "%b\n" "${RED}No operating systems found.${RC}"
-        exit 1
-    fi
-
-    printf "%b\n" "${YELLOW}Available Operating Systems:${RC}"
-    comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.[].name')"
-    printf "\n%b" "Select an operating system: "
-    read -r OS
-
-    OS_JSON="$(echo "${OS_JSON}" | jq --arg os "${OS}" -c '.[] | select(.name == $os)')"
-    if [ -z "${OS_JSON}" ]; then
-        printf "%b\n" "${RED}Invalid operating system selected.${RC}"
-        exit 1
-    fi
-    PRETTY_NAME="$(echo "${OS_JSON}" | jq -r '.pretty_name')"
-
-    printf "\n%b\n" "${YELLOW}Available releases for ${PRETTY_NAME}:${RC}"
-    comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.releases[].release' | sort -Vur)"
-    printf "\n%b" "Select a release: "
-    read -r RELEASE
-    printf "\n"
-
-    OS_JSON="$(echo "${OS_JSON}" | jq --arg release "${RELEASE}" -c '.releases |= map(select(.release == $release))')"
-    if echo "${OS_JSON}" | jq -e '.releases | length == 0' >/dev/null; then
-        printf "%b\n" "${RED}Invalid release selected.${RC}"
-        exit 1
-    fi
-
-    if echo "${OS_JSON}" | jq -e '.releases[] | select(.edition != null) | any' >/dev/null; then
-        printf "%b\n" "${YELLOW}Available editions for ${PRETTY_NAME} ${RELEASE}:${RC}"
-        comma_delimited_list "$(echo "${OS_JSON}" | jq -r '.releases[].edition' | sort -Vur)"
-        printf "\n%b" "Select an edition: "
-        read -r EDITION
-        ENTRY="$(echo "${OS_JSON}" | jq --arg edition "${EDITION}" -c '.releases[] | select(.edition == $edition)')"
-    else
-        ENTRY="$(echo "${OS_JSON}" | jq -c '.releases[0]')"
-    fi
-
-    if [ -z "${ENTRY}" ]; then
-        printf "%b\n" "${RED}Invalid edition selected.${RC}"
-        exit 1
-    fi
-
-    WEB_DATA="$(echo "${ENTRY}" | jq -c '.iso[0].web')"
-
-    ISO_URL="$(echo "${WEB_DATA}" | jq -r '.url')"
-    ISO_CHECKSUM="$(echo "${WEB_DATA}" | jq -r '.checksum')"
-    ISO_ARCHIVE_FORMAT="$(echo "${WEB_DATA}" | jq -r '.archive_format')"
-
-    ISO_FILENAME="$(echo "${WEB_DATA}" | jq -r '.file_name')"
-    if [ "${ISO_FILENAME}" = "null" ]; then
-        ISO_FILENAME="$(basename "${ISO_URL}")"
-    fi
-
-    ISO_PATH="${HOME}/Downloads/${ISO_FILENAME}"
-    download_iso
-
-    if [ "${ISO_CHECKSUM}" != "null" ]; then
-        check_hash
-    fi
-    if [ "${ISO_ARCHIVE_FORMAT}" != "null" ]; then
-        decompress_iso
-    fi
-}
-
 write_iso(){  
    clear

@ -270,5 +191,4 @@ write_iso(){

 checkEnv
 checkEscalationTool
-installDependencies
-write_iso
+write_iso
--- 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" -S --noconfirm --needed openssl
+            "$ESCALATION_TOOL" "$PACKAGER" -Syu --noconfirm openssl
            ;;
        apt-get|nala)
            "$ESCALATION_TOOL" "$PACKAGER" install -y openssl
@ -19,9 +19,6 @@ if ! command_exists openssl; then
        zypper)
            "$ESCALATION_TOOL" "$PACKAGER" install openssl
            ;;
-        apk)
-            "$ESCALATION_TOOL" "$PACKAGER" add openssl
-            ;;
        *)
            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
            exit 1
--- a/core/tabs/utils/monitor-control/change_orientation.sh
+++ b/core/tabs/utils/monitor-control/change_orientation.sh
@ -13,7 +13,7 @@ change_orientation() {
    printf "%b\n" "${YELLOW}=========================================${RC}"
    printf "%b\n" "${YELLOW}  Change Monitor Orientation${RC}"
    printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b\n" "${YELLOW}Choose a monitor to configure: ${RC}"
+    printf "%b" "${YELLOW}Choose a monitor to configure: ${RC}"
    i=1
    for monitor in $monitor_array; do
        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
--- a/core/tabs/utils/monitor-control/disable_monitor.sh
+++ b/core/tabs/utils/monitor-control/disable_monitor.sh
@ -13,7 +13,7 @@ disable_monitor() {
    printf "%b\n" "${YELLOW}=========================================${RC}"
    printf "%b\n" "${YELLOW}  Disable Monitor${RC}"
    printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b\n" "Choose a monitor to disable: "
+    printf "%b" "Choose a monitor to disable: "
    i=1
    for monitor in $monitor_array; do
        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
--- a/core/tabs/utils/monitor-control/enable_monitor.sh
+++ b/core/tabs/utils/monitor-control/enable_monitor.sh
@ -13,7 +13,7 @@ enable_monitor() {
    printf "%b\n" "${YELLOW}=========================================${RC}"
    printf "%b\n" "${YELLOW}  Enable Monitor${RC}"
    printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b\n" "${YELLOW}Choose a monitor to enable: ${RC}"
+    printf "%b" "${YELLOW}Choose a monitor to enable: ${RC}"
    
    i=1
    for monitor in $monitor_array; do
--- a/core/tabs/utils/monitor-control/extend_displays.sh
+++ b/core/tabs/utils/monitor-control/extend_displays.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-. ../utility_functions.sh
+. ./utility_functions.sh

 . ../../common-script.sh

--- a/core/tabs/utils/monitor-control/manage_arrangement.sh
+++ b/core/tabs/utils/monitor-control/manage_arrangement.sh
@ -13,10 +13,10 @@ manage_arrangement() {
    printf "%b\n" "${YELLOW}=========================================${RC}"
    printf "%b\n" "${YELLOW}  Manage Monitor Arrangement${RC}"
    printf "%b\n" "${YELLOW}=========================================${RC}"
-    printf "%b\n" "${YELLOW}Choose the monitor to arrange: ${RC}"
+    printf "%b" "${YELLOW}Choose the monitor to arrange: ${RC}"
    i=1
    for monitor in $monitor_array; do
-        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
+        printf "%b\n" "$i. ${YELLOW}$monitor${RC}"
        i=$((i + 1))
    done

--- a/core/tabs/utils/monitor-control/set_brightness.sh
+++ b/core/tabs/utils/monitor-control/set_brightness.sh
@ -6,6 +6,8 @@
 adjust_monitor_brightness() {
    while true; do
        monitor_list=$(detect_connected_monitors)
+        monitor_array=$(echo "$monitor_list" | tr '\n' ' ')
+        set -- "$monitor_array"
        count=1

        clear
@ -13,7 +15,7 @@ adjust_monitor_brightness() {
        printf "%b\n" "${YELLOW}  Adjust Monitor Brightness${RC}"
        printf "%b\n" "${YELLOW}=========================================${RC}"
        printf "%b\n" "${YELLOW}Choose a monitor to adjust brightness:${RC}"
-        echo "$monitor_list" | while IFS= read -r monitor; do
+        for monitor in "$@"; do
            echo "$count. $monitor"
            count=$((count + 1))
        done
@ -33,18 +35,18 @@ adjust_monitor_brightness() {
            continue
        fi

-        monitor_count=$(echo "$monitor_list" | wc -l)
-        if [ "$monitor_choice" -lt 1 ] || [ "$monitor_choice" -gt "$monitor_count" ]; then
+        if [ "$monitor_choice" -lt 1 ] || [ "$monitor_choice" -gt "$#" ]; then
            printf "%b\n" "${RED}Invalid selection. Please try again.${RC}"
            printf "Press [Enter] to continue..."
            read -r dummy
            continue
        fi

-        monitor_name=$(echo "$monitor_list" | sed -n "${monitor_choice}p")
+        monitor_name=$(eval echo "\${$monitor_choice}")
        current_brightness=$(get_current_brightness "$monitor_name")

-        current_brightness_percentage=$(awk -v brightness="$current_brightness" 'BEGIN {printf "%.0f", brightness * 100}')
+        # Correctly calculate the brightness percentage
+        current_brightness_percentage=$(awk "BEGIN {printf \"%.0f\", $current_brightness * 100}")
        printf "%b\n" "${YELLOW}Current brightness for $monitor_name${RC}: ${GREEN}$current_brightness_percentage%${RC}"

        while true; do
--- a/core/tabs/utils/monitor-control/set_primary_monitor.sh
+++ b/core/tabs/utils/monitor-control/set_primary_monitor.sh
@ -16,7 +16,7 @@ set_primary_monitor() {
    printf "%b\n" "${YELLOW}Choose a monitor to set as primary:${RC}"
    i=1
    for monitor in $monitor_array; do
-        printf "%b\n" "$i. ${GREEN}$monitor${RC}"
+        printf "%b\n" "$i. ${YELLOW}$monitor${RC}"
        i=$((i + 1))
    done

--- a/core/tabs/utils/numlock.sh
+++ b/core/tabs/utils/numlock.sh
@ -1,11 +1,15 @@
 #!/bin/sh -e

 . ../common-script.sh
-. ../common-service-script.sh
+
+# setleds can be used in all distros
+# This method works by calling a script using systemd service
+
+# Create a script to toggle numlock

 create_file() {
-    printf "%b\n" "Creating script..."
-    "$ESCALATION_TOOL" tee "/usr/local/bin/numlock" >/dev/null <<'EOF'
+  printf "%b\n" "Creating script..."
+  "$ESCALATION_TOOL" tee "/usr/local/bin/numlock" >/dev/null <<'EOF'
 #!/bin/bash

 for tty in /dev/tty{1..6}
@ -14,12 +18,13 @@ do
 done
 EOF

-    "$ESCALATION_TOOL" chmod +x /usr/local/bin/numlock
+  "$ESCALATION_TOOL" chmod +x /usr/local/bin/numlock
 }

+# Create a systemd service to run the script on boot
 create_service() {
-    printf "%b\n" "Creating service..."
-    "$ESCALATION_TOOL" tee "/etc/systemd/system/numlock.service" >/dev/null <<'EOF'
+  printf "%b\n" "Creating service..."
+  "$ESCALATION_TOOL" tee "/etc/systemd/system/numlock.service" >/dev/null <<'EOF'
 [Unit]
 Description=numlock
        
@ -34,28 +39,24 @@ EOF
 }

 numlockSetup() {
-    if [ "$INIT_MANAGER" = "rc-service" ]; then
-        printf "%b\n" "${RED}Unsupported init system.${RC}"
-        exit 1
-    fi
+  # Check if the script and service files exists
+  if [ ! -f "/usr/local/bin/numlock" ]; then
+    create_file
+  fi

-    if [ ! -f "/usr/local/bin/numlock" ]; then
-        create_file
-    fi
+  if [ ! -f "/etc/systemd/system/numlock.service" ]; then
+    create_service
+  fi

-    if [ ! -f "/etc/systemd/system/numlock.service" ]; then
-        create_service
-    fi
-
-    printf "%b" "Do you want to enable Numlock on boot? (y/N): "
-    read -r confirm
-    if [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]; then
-        enableService numlock
-        printf "%b\n" "Numlock will be enabled on boot"
-    else
-        disableService numlock
-        printf "%b\n" "Numlock will not be enabled on boot"
-    fi
+  printf "%b" "Do you want to enable Numlock on boot? (y/N): "
+  read -r confirm
+  if [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]; then
+    "$ESCALATION_TOOL" systemctl enable numlock.service --quiet
+    printf "%b\n" "Numlock will be enabled on boot"
+  else
+    "$ESCALATION_TOOL" systemctl disable numlock.service --quiet
+    printf "%b\n" "Numlock will not be enabled on boot"
+  fi
 }

 checkEnv
--- a/core/tabs/utils/ollama.sh
+++ b/core/tabs/utils/ollama.sh
@ -10,8 +10,8 @@ installollama() {
        printf "%b\n" "${GREEN}ollama is already installed.${RC}"
    else
        printf "%b\n" "${YELLOW}Installing ollama...${RC}"
-        curl -fsSL https://ollama.com/install.sh | "$ESCALATION_TOOL" sh
-        "$ESCALATION_TOOL" startService ollama 
+        curl -fsSL https://ollama.com/install.sh | sh
+        "$ESCALATION_TOOL" systemctl start ollama 
    fi
 }

--- a/core/tabs/utils/power-profile.sh
+++ b/core/tabs/utils/power-profile.sh
@ -19,9 +19,6 @@ installAutoCpufreq() {
                pacman)
                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm git
                    ;;
-                apk)
-                    "$ESCALATION_TOOL" "$PACKAGER" add git
-                    ;;
                *)
                    "$ESCALATION_TOOL" "$PACKAGER" install -y git
                    ;;
--- a/core/tabs/utils/samba-ssh-setup.sh
+++ b/core/tabs/utils/samba-ssh-setup.sh
@ -11,9 +11,6 @@ install_package() {
            pacman)
                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$PACKAGE"
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add "$PACKAGE"
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y "$PACKAGE"
                ;;
@ -37,23 +34,23 @@ setup_ssh() {
        install_package openssh
        SSH_SERVICE="sshd"
        ;;
-    apk)
-        install_package openssh
-        SSH_SERVICE="sshd"
-        ;;
    *)
        install_package openssh-server
        SSH_SERVICE="sshd"
        ;;
    esac

-    startAndEnableService "$SSH_SERVICE"
+    # Enable and start the appropriate SSH service
+    "$ESCALATION_TOOL" systemctl enable "$SSH_SERVICE"
+    "$ESCALATION_TOOL" systemctl start "$SSH_SERVICE"

+    # Get the local IP address
    LOCAL_IP=$(ip -4 addr show | awk '/inet / {print $2}' | tail -n 1)

    printf "%b\n" "${GREEN}Your local IP address is: $LOCAL_IP${RC}"

-    if isServiceActive "$SSH_SERVICE"; then
+    # Check if SSH is running
+    if systemctl is-active --quiet "$SSH_SERVICE"; then
        printf "%b\n" "${GREEN}SSH is up and running.${RC}"
    else
        printf "%b\n" "${RED}Failed to start SSH.${RC}"
@ -133,11 +130,12 @@ setup_samba() {
 EOL
    fi

-    for service in smb nmb; do
-        startAndEnableService "$service"
-    done
+    # Enable and start Samba services
+    "$ESCALATION_TOOL" systemctl enable smb nmb
+    "$ESCALATION_TOOL" systemctl start smb nmb

-    if isServiceActive smb && isServiceActive nmb; then
+    # Check if Samba is running
+    if systemctl is-active --quiet smb && systemctl is-active --quiet nmb; then
        printf "%b\n" "${GREEN}Samba is up and running.${RC}"
        printf "%b\n" "${YELLOW}Samba share available at: $SHARED_DIR${RC}"
    else
--- a/core/tabs/utils/ssh.sh
+++ b/core/tabs/utils/ssh.sh
@ -4,15 +4,14 @@

 # Check if ~/.ssh/config exists, if not, create it
 if [ ! -f ~/.ssh/config ]; then
-    mkdir -p "$HOME/.ssh"
-    touch "$HOME/.ssh/config"
-    chmod 600 "$HOME/.ssh/config"
+    touch ~/.ssh/config
+    chmod 600 ~/.ssh/config
 fi

 # Function to show available hosts from ~/.ssh/config
 show_available_hosts() {
    printf "%b\n" "Available Systems:"
-    grep -E "^Host " "$HOME/.ssh/config" | awk '{print $2}'
+    grep -E "^Host " ~/.ssh/config | awk '{print $2}'
    printf "%b\n" "-------------------"
 }

--- a/core/tabs/utils/tab_data.toml
+++ b/core/tabs/utils/tab_data.toml
@ -1,8 +1,8 @@
 name = "Utilities"
+multi_selectable = false

 [[data]]
 name = "Monitor Control"
-multi_select = false

 [[data.preconditions]]
 matches = true
@ -78,7 +78,6 @@ script = "monitor-control/set_resolutions.sh"

 [[data]]
 name = "User Account Manager"
-multi_select = false

 [[data.entries]]
 name = "Add User"
@ -105,7 +104,6 @@ name = "Auto Mount Drive"
 description = "This utility is designed to help with automating the process of mounting a drive on to your system."
 script = "auto-mount.sh"
 task_list = "PFM"
-multi_select = false

 [[data]]
 name = "Auto Login"
@ -122,7 +120,6 @@ name = "Bluetooth Manager"
 description = "This utility is designed to manage bluetooth in your system"
 script = "bluetooth-control.sh"
 task_list = "I SS"
-multi_select = false

 [[data]]
 name = "Bootable USB Creator"
@ -136,7 +133,7 @@ task_list = "I FM"

 [[data]]
 name = "Numlock on Startup"
-description = "This utility is designed to enable Num Lock at boot, rather than within desktop environments like KDE or GNOME"
+description = "This utility is designed to configure auto enabling of numlock on boot"
 script = "numlock.sh"
 task_list = "PFM SS"

@ -167,11 +164,6 @@ name = "Timeshift Backup"
 script = "timeshift.sh"
 task_list = "I"

-[[data.preconditions]]
-matches = false
-data = "command_exists"
-values = [ "dnf" ]
-
 [[data]]
 name = "WiFi Manager"
 description = "This utility is designed to manage wifi in your system"
--- a/core/tabs/utils/timeshift.sh
+++ b/core/tabs/utils/timeshift.sh
@ -12,11 +12,8 @@ install_timeshift() {
            pacman)
                "$ESCALATION_TOOL" "${PACKAGER}" -S --noconfirm timeshift
                ;;
-            dnf|zypper|apt-get|nala)
-                "$ESCALATION_TOOL" "${PACKAGER}" install -y timeshift
-                ;;
            *)
-                printf "%b\n" "${RED}Unsupported package manager.${RC}"
+                "$ESCALATION_TOOL" "${PACKAGER}" install -y timeshift
                ;;
        esac
    else
--- a/core/tabs/utils/utility_functions.sh
+++ b/core/tabs/utils/utility_functions.sh
@ -13,9 +13,6 @@ setup_xrandr() {
            apt-get|nala)
                "$ESCALATION_TOOL" "$PACKAGER" install -y x11-xserver-utils
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add xrandr
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y xorg-x11-server-utils
                ;;
--- a/core/tabs/utils/wifi-control.sh
+++ b/core/tabs/utils/wifi-control.sh
@ -1,7 +1,6 @@
 #!/bin/sh -e

 . ../common-script.sh
-. ../common-service-script.sh

 # Function to check if NetworkManager is installed
 setupNetworkManager() {
@ -14,9 +13,6 @@ setupNetworkManager() {
            dnf)
                "$ESCALATION_TOOL" "$PACKAGER" install -y NetworkManager-1
                ;;
-            apk)
-                "$ESCALATION_TOOL" "$PACKAGER" add networkmanager-wifi iwd
-                ;;
            *)
                "$ESCALATION_TOOL" "$PACKAGER" install -y network-manager
                ;;
@ -26,11 +22,13 @@ setupNetworkManager() {
    fi
    
    # Check if NetworkManager service is running
-    if ! isServiceActive NetworkManager; then
+    if ! systemctl is-active --quiet NetworkManager; then
        printf "%b\n" "${YELLOW}NetworkManager service is not running. Starting it now...${RC}"
-        startService NetworkManager
-    else 
-        printf "%b\n" "${GREEN}NetworkManager service started successfully.${RC}"
+        "$ESCALATION_TOOL" systemctl start NetworkManager
+        
+        if systemctl is-active --quiet NetworkManager; then
+            printf "%b\n" "${GREEN}NetworkManager service started successfully.${RC}"
+        fi
    fi
 }

--- a/docs/assets/preview.gif
+++ b/docs/assets/preview.gif
--- a/docs/contributing.md
+++ b/docs/contributing.md
@ -1,6 +1,4 @@
-<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->
-
-# Contributing Guidelines for Linutil
+<!-- THIS FILE IS GENERATED AUTOMATICALLY. EDIT .github/CONTRIBUTING.md -->\n\n# Contributing Guidelines for Linutil

 Thank you for considering contributing to Linutil! We appreciate your effort in helping improve this project. To ensure that your contributions align with the goals and quality standards of Linutil, please follow these guidelines:

@ -18,7 +16,6 @@ cd linutil
   ```

 ## 3. Make your changes
-
 - **Edit the files you want to change**: Make your changes to the relevant files.
 - **Test your changes**: Run `cargo run` to test your modifications in a local environment and ensure everything works as expected.

@ -63,7 +60,6 @@ cd linutil
 ## 11. Documentation

 - **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
- **Automatic generation**: If you decide to add functionality through a new shell script, make sure to fill out all fields in `tab_data.toml` and run `cargo xtask docgen`.

 ## 12. License

--- a/Show More
+++ b/Show More