Release v2.4.0

Former-commit-id: 7ddff66f00
Update
2026-04-02 11:12:09 +02:00 · 2024-09-04 10:11:28 +02:00 · 2024-09-04 10:10:52 +02:00 · 2024-09-04 10:10:32 +02:00 · 2024-09-04 09:34:42 +02:00 · 2024-09-04 02:02:57 +02:00
336 changed files with 1254 additions and 54382 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,11 +1,11 @@
 keys:
  - &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
 creation_rules:
-  - path_regex: hosts/laptop/secrets/laptop.yaml$
+  - path_regex: hosts/laptop/secrets/secrets.yaml$
    key_groups:
      - age:
        - *primary
-  - path_regex: hosts/server/secrets/server.yaml$
+  - path_regex: hosts/server/secrets/secrets.yaml$
    key_groups:
      - age:
        - *primary
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 [//]: # (Title: Nixy)  
 [//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
-[//]: # (Date: 08/18/24)
-[//]: # (Version: v2.0.1)
+[//]: # (Date: 09/04/24)
+[//]: # (Version: v2.3.0)

 <div align="center">
    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
@@ -15,7 +15,7 @@
 <br>
 <div align="center">
    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.0.1&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.3.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
    </a>
    <a href="https://github.com/anotherhadi/nixy/stargazers">
        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
@@ -40,27 +40,41 @@ It's a simple way to manage your system configuration and dotfiles.
  - [Table of Content](#table-of-content)
  - [Gallery](#gallery)
  - [Architecture](#architecture)
+    - [🏠 `home`](#-home)
+    - [💻 `hosts`](#-hosts)
  - [Installation](#installation)
  - [Documentation](#documentation)

 ## Gallery

-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)

 ## Architecture

- 🏠 `home` are the dotfiles and configuration files for the users
-  - 'programs' is a collection of apps configured with home-manager
-  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-  - 'system' is some desktop environment like configuration
-  - 'wallpapers' are... wallpapers
- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+### 🏠 `home`
+
+Those are the dotfiles and configuration files for user-level configuration
+
+**Subfolders:**
+
+- `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)

 ## Installation

--- a/docs/APPS.md
+++ b/docs/APPS.md
@@ -8,13 +8,14 @@ The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu r
 The configurations files can be found in the `hosts/laptop` directory.

 | Category                                | Name           |
-|-----------------------------------------|----------------|
+| --------------------------------------- | -------------- |
 | WM                                      | Hyprland       |
 |                                         | hyprlock       |
 |                                         | hyprpaper      |
 |                                         | hypridle       |
+|                                         | hyprcursor     |
 |                                         | wlogout        |
-| Bar                                     | waybar         |
+| Bar                                     | hyprpanel      |
 | Terminal                                | kitty          |
 | Shell                                   | zsh            |
 |                                         | tmux           |
@@ -24,33 +25,17 @@ The configurations files can be found in the `hosts/laptop` directory.
 |                                         | zoxide         |
 |                                         | fzf            |
 | Editor                                  | neovim(nixvim) |
-| File manager                            | lf             |
-|                                         | thunar         |
+| File manager                            | thunar         |
 | Browser                                 | qutebrowser    |
 | Music                                   | spicetify      |
-| Notifications                           | dunst          |
 | Launcher                                | wofi           |
 | DM                                      | tuigreet       |
 | Secrets                                 | sops-nix       |
-| Misc                                    | lazygit        |
-|                                         | neofetch       |
-|                                         | cava           |
 | See [hosts/laptop](../hosts/laptop/)... |                |

 ## Server

 The server configuration is used by a home server running NixOS.
 The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, ...
+I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
 I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
-
-### Apps
-
- Nextcloud
- Vaultwarden
- Adguard Home
- Unifi Controler
- Uptime Kuma
- "Jackflix"
-  - Jellyfin, Transmission, *arr
- See [hosts/server](../hosts/server/)...
--- a/docs/KEYBINDINGS.md
+++ b/docs/KEYBINDINGS.md
@@ -2,37 +2,41 @@

 The list of the keybindings working on Hyprland:

-| Description                 | Keybinding             | Command                                                            |
-| --------------------------- | ---------------------- | ------------------------------------------------------------------ |
-| Switch Workspace            | SUPER + {Number}       | workspace {Number}                                                 |
-| Move app to Workspace       | SUPER SHIFT + {Number} | movetoworkspace {Number}                                           |
-| Kitty                       | SUPER + RETURN         | exec \${pkgs.kitty}/bin/kitty                                      |
-| Thunar                      | SUPER + E              | exec \${pkgs.xfce.thunar}/bin/thunar                               |
-| Qutebrowser                 | SUPER + B              | exec \${pkgs.qutebrowser}/bin/qutebrowser                          |
-| Bitwarden                   | SUPER + K              | exec \${pkgs.bitwarden}/bin/bitwarden                              |
-| Peaclock                    | SUPER + C              | exec \${pkgs.kitty}/bin/kitty --class peaclock peaclock            |
-| Lock                        | SUPER + L              | exec \${pkgs.hyprlock}/bin/hyprlock                                |
-| Powermenu                   | SUPER + X              | exec powermenu                                                     |
-| Launcher                    | SUPER + SPACE          | exec menu                                                          |
-| Close window                | SUPER + Q              | killactive                                                         |
-| Toggle Floating             | SUPER + T              | togglefloating                                                     |
-| Toggle Fullscreen           | SUPER + F              | fullscreen                                                         |
-| Move focus left             | SUPER + left           | movefocus l                                                        |
-| Move focus Right            | SUPER + right          | movefocus r                                                        |
-| Move focus Up               | SUPER + up             | movefocus u                                                        |
-| Move focus Down             | SUPER + down           | movefocus d                                                        |
-| Screenshot window           | SUPER + PRINT          | exec screenshot window                                             |
-| Screenshot monitor          | PRINT                  | exec screenshot monitor                                            |
-| Screenshot region           | SUPER SHIFT + PRINT    | exec screenshot region                                             |
-| Screenshot region then edit | ALT PRINT              | exec screenshot region swappy                                      |
-| Turn off night shift        | SUPER + F2             | exec night-shift-off                                               |
-| Turn on night shift         | SUPER + F3             | exec night-shift-on                                                |
-| Choose sound output         | SUPER + F5             | exec \${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output |
-| Move Window (mouse)         | SUPER + mouse:272      | movewindow                                                         |
-| Resize Window (mouse)       | SUPER + R              | resizewindow                                                       |
-| Toggle Mute                 | XF86AudioMute          | exec sound-toggle                                                  |
-| Lock when closing Lid       | switch:Lid Switch      | exec \${pkgs.hyprlock}/bin/hyprlock                                |
-| Sound Up                    | XF86AudioRaiseVolume   | exec sound-up                                                      |
-| Sound Down                  | XF86AudioLowerVolume   | exec sound-down                                                    |
-| Brightness Up               | XF86MonBrightnessUp    | exec brightness-up                                                 |
-| Brightness Down             | XF86MonBrightnessDown  | exec brightness-down                                               |
+| Description                                | Keybinding               |
+|--------------------------------------------|--------------------------|
+| Switch Workspace                           | SUPER + {Number}         |
+| Move app to Workspace                      | SHIFT + SUPER + {Number} |
+| Kitty                                      | SUPER + RETURN           |
+| Thunar                                     | SUPER + E                |
+| Qutebrowser                                | SUPER + B                |
+| Bitwarden                                  | SUPER + K                |
+| Lock                                       | SUPER + L                |
+| Powermenu                                  | SUPER + X                |
+| Launcher                                   | SUPER + SPACE            |
+| "\$shiftMod, SPACE, hyprexpo:expo, toggle" |                          |
+| Close window                               | SUPER + Q                |
+| Toggle Floating                            | SUPER + T                |
+| Toggle Fullscreen                          | SUPER + F                |
+| Move focus left                            | SUPER + left             |
+| Move focus Right                           | SUPER + right            |
+| Move focus Up                              | SUPER + up               |
+| Move focus Down                            | SUPER + down             |
+| Add to master                              | SHIFT + SUPER + left     |
+| Remove from master                         | SHIFT + SUPER + right    |
+| Screenshot window                          | SUPER + PRINT            |
+| Screenshot monitor                         | PRINT                    |
+| Screenshot region                          | SHIFT + SUPER + PRINT    |
+| Screenshot region then edit                | ALT PRINT                |
+| Search on internet with wofi               | SHIFT + SUPER + S        |
+| Clipboard picker with wofi                 | SHIFT + SUPER + C        |
+| Emoji picker with wofi                     | SHIFT + SUPER + E        |
+| Turn off night shift                       | SUPER + F2               |
+| Turn on night shift                        | SUPER + F3               |
+| Move Window (mouse)                        | SUPER + mouse:272        |
+| Resize Window (mouse)                      | SUPER + R                |
+| Toggle Mute                                | XF86AudioMute            |
+| Lock when closing Lid                      | switch:Lid Switch        |
+| Sound Up                                   | XF86AudioRaiseVolume     |
+| Sound Down                                 | XF86AudioLowerVolume     |
+| Brightness Up                              | XF86MonBrightnessUp      |
+| Brightness Down                            | XF86MonBrightnessDown    |
--- a/docs/SCRIPTS.md
+++ b/docs/SCRIPTS.md
@@ -1,6 +1,6 @@
 # Scripts

-Scripts are located in the `home/scripts` folder. Home-manager add those in the path.
+Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.

 ## Nix/NixOs shortcuts

@@ -18,14 +18,15 @@ Scripts are located in the `home/scripts` folder. Home-manager add those in the

 - `brightness-up`
 - `brightness-down`
- `brightness-change <up/down> <increment>`
+- `brightness-set [value]`
+- `brightness-change [up/down] <increment>`

 ## Sound control

 - `sound-up`
 - `sound-down`
 - `sound-toggle`
- `sound-output`
+- `sound-set [value]`
 - `sound-change [up/down/mute] <increment>`

 ## Caffeine
@@ -33,14 +34,16 @@ Scripts are located in the `home/scripts` folder. Home-manager add those in the
 Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).

 - `caffeine` # Toggle caffeine
- `caffeine-status` # Return active/inactive
+- `caffeine-status` # Return 1/0
+- `caffeine-status-icon` # Return 󰅶/󰾪

 ## Night-Shift

 Blue light filter, using wlsunset

 - `night-shift` # Toggle night shift
- `night-shift-status` # Return active/inactive
+- `night-shift-status` # Return 1/0
+- `night-shift-status-icon` # Return 󰖕/󰖔
 - `night-shift-on`
 - `night-shift-off`

@@ -50,10 +53,3 @@ Nerdfont fzf is a quick way to search for nerdfont icons locally.
 It will copy the selected icon to the clipboard.

 - `nerdfont-fzf`
-
-## Compress/Extract
-
-Some shortcuts to compress and extract files.
-
- `compress` ...
- `extract` ...
--- a/docs/THEMES.md
+++ b/docs/THEMES.md
@@ -18,15 +18,3 @@ Wallpapers are loaded from the `home/wallpapers` folder.
 ![nixy1](src/nixy/1.png)
 ![nixy2](src/nixy/2.png)
 ![nixy3](src/nixy/3.png)
-
-### Catppuccin
-
-![catppuccin1](src/catppuccin/1.png)
-![catppuccin2](src/catppuccin/2.png)
-![catppuccin3](src/catppuccin/3.png)
-
-### Windows
-
-![windows1](src/windows/1.png)
-![windows2](src/windows/2.png)
-![windows3](src/windows/3.png)
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,44 +1,33 @@
-# Todolist
+# Todolist {

 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))

- [ ] Jackflix V2
-  - Backup Radarr, Prowlarr, Sonarr config
+- [ ] Wofi config
+  - Calculator

- [ ] Nixy
-  - [~] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
-  - [~] Variables-template with defaults
-  - [ ] Themes
-    - [ ] macOS theme
-  - [ ] Tofi (Wofi, but terminal based)
+- [ ] Test hyprshade (replacement for gammastep)

 - [ ] Qutebrowser
  - [ ] !!! Bitwarden integration (I need this.)

 - [ ] Hyprland
-  - [-] Implement Hyprcursor (see home/system/hyprland/hyprcursor.nix: Not working, small cursor on some apps, big one on others)
-  - [ ] Animations based on app name
-    - [ ] Wofi: popin
-    - [ ] Wlogout: fade in
-  - [ ] Fix screenshots
-  - [ ] Fix hyprlock
-  - [ ] Hyprlock tty theme
+  - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?) and add in the scripts doc

 - [ ] Nixvim
  - [ ] Keymaps:
    - Trouble
-    - Tagbar
-  - [ ] Disable background color for headlines.nvim for titles
+    - Tagbar (actually not working)

- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
-  - [ ] Exclude file pattern (nodes modules, ...)
-  - [ ] Auto backup when a specific usb key is plugged
-  - [ ] Pika backup?
+- [ ] Change my keyboard backlight
+  - Issue on nixos-hardware ig

- [ ] Markdown to pdf tool
+- [ ] Update docs

- [ ] Server
-  - [ ] Bitcoin-git
-  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
-  - [ ] Ntfy auth file
-  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)
+## Server
+
+- [ ] Jackflix V2
+  - Backup Radarr, Prowlarr, Sonarr config
+  - Take a look into buildarr or build a custom solution with *arr apis
+- [ ] Bitcoin-git: broken
+- [ ] Secrets mode 0444: not secure
+- [ ] Adguard config
--- a/docs/WALLPAPERS.md
+++ b/docs/WALLPAPERS.md
@@ -28,8 +28,8 @@ Wallpapers can be found in the `/home/wallpapers` folder.
 | mountains.png       | ![mountains.png](../home/wallpapers/mountains.png)             |
 | nix.png             | ![nix.png](../home/wallpapers/nix.png)                         |
 | problems.png        | ![problems.png](../home/wallpapers/problems.png)               |
+| sea2.png            | ![sea2.png](../home/wallpapers/sea2.png)                       |
 | sea.png             | ![sea.png](../home/wallpapers/sea.png)                         |
-| see.png             | ![see.png](../home/wallpapers/see.png)                         |
 | space2.png          | ![space2.png](../home/wallpapers/space2.png)                   |
 | space.png           | ![space.png](../home/wallpapers/space.png)                     |
 | street.png          | ![street.png](../home/wallpapers/street.png)                   |
--- a/docs/scripts/new_tag.sh
+++ b/docs/scripts/new_tag.sh
@@ -7,14 +7,18 @@ echo "Current tag: $TAG"

 read -rp "Enter the new tag name: " NEW_TAG

-echo "Compresing png files..."
-bash ./docs/scripts/compress_png.sh
+read -rp "Do you want to compress the png files? [y/N]: " COMPRESS_PNG
+if [[ "$COMPRESS_PNG" == "y" || "$COMPRESS_PNG" == "Y" ]]; then
+  echo "Compresing png files..."
+  bash ./docs/scripts/compress_png.sh
+fi
+
 echo "Creating wallpapers preview..."
 bash ./docs/scripts/create_preview_wallpapers.sh
 echo "Creating README.md..."
 bash ./docs/scripts/create_readme.sh
 echo "Creating keybindings.md..."
-bash ./docs/scripts/create_keybindings.sh
+bash ./docs/scripts/keybindings_to_markdown.sh

 git add .
 git commit -m "Release $NEW_TAG"
--- a/docs/src/README_template.md
+++ b/docs/src/README_template.md
@@ -8,22 +8,34 @@ It's a simple way to manage your system configuration and dotfiles.

 ## Gallery

-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)

 ## Architecture

- 🏠 `home` are the dotfiles and configuration files for the users
-  - 'programs' is a collection of apps configured with home-manager
-  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-  - 'system' is some desktop environment like configuration
-  - 'wallpapers' are... wallpapers
- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+### 🏠 `home`
+
+Those are the dotfiles and configuration files for user-level configuration
+
+**Subfolders:**
+
+- `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)

 ## Installation

--- a/docs/src/catppuccin/1.png
+++ b/docs/src/catppuccin/1.png
--- a/docs/src/catppuccin/2.png
+++ b/docs/src/catppuccin/2.png
--- a/docs/src/catppuccin/3.png
+++ b/docs/src/catppuccin/3.png
--- a/docs/src/windows/1.png.REMOVED.git-id
+++ b/docs/src/windows/1.png.REMOVED.git-id
@@ -1 +0,0 @@
-62b52ad02a886c19a8cfe1ea17e8aaad50f23632
--- a/docs/src/windows/2.png
+++ b/docs/src/windows/2.png
--- a/docs/src/windows/3.png
+++ b/docs/src/windows/3.png
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,24 @@
 {
  "nodes": {
+    "ags": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1721306136,
+        "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
    "apple-fonts": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -44,11 +63,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723920171,
-        "narHash": "sha256-dVCMrAe+D/5S91erhwQj2DSzHOVzAanWqoy+vPWB9DY=",
+        "lastModified": 1725016199,
+        "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "71d49670fe246cdaff4860b0effba0ab9f163b72",
+        "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906",
        "type": "github"
      },
      "original": {
@@ -92,6 +111,22 @@
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@@ -133,7 +168,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1710146030,
@@ -149,24 +184,6 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "git-hooks": {
      "inputs": {
        "flake-compat": [
@@ -184,11 +201,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723202784,
-        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
        "type": "github"
      },
      "original": {
@@ -226,11 +243,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -247,11 +264,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -301,11 +318,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1724014641,
-        "narHash": "sha256-ub/HCvrxuvvqmnWpNdcyi/mp0G9+rNjtKHrA7cwyuis=",
+        "lastModified": 1725019943,
+        "narHash": "sha256-tAGs6TpIYkRUWjU0WYAavzHCPy4XLLMn63caFF7OCNc=",
        "ref": "refs/heads/main",
-        "rev": "f4045ab8d032186b7c5409cd9f05eeaa813320ba",
-        "revCount": 5109,
+        "rev": "25e72949a1cc2368425ed81712a394cb277f514f",
+        "revCount": 5160,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -316,6 +333,36 @@
        "url": "https://github.com/hyprwm/Hyprland"
      }
    },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723143591,
+        "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
    "hyprland-protocols": {
      "inputs": {
        "nixpkgs": [
@@ -359,11 +406,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721324361,
-        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+        "lastModified": 1724174162,
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
        "type": "github"
      },
      "original": {
@@ -372,6 +419,25 @@
        "type": "github"
      }
    },
+    "hyprpanel": {
+      "inputs": {
+        "ags": "ags",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1725006826,
+        "narHash": "sha256-DO9Sxg+HP7Iy/TguZtjwXRjlH35liWXEuG17ilcJejI=",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "rev": "4bd5c3ed30ae643ac1dee152f8b9332d0c5c3eb9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "type": "github"
+      }
+    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -384,11 +450,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722869141,
-        "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
+        "lastModified": 1724966483,
+        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
+        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
        "type": "github"
      },
      "original": {
@@ -430,11 +496,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722924007,
-        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "lastModified": 1724561770,
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
        "type": "github"
      },
      "original": {
@@ -445,11 +511,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1724878143,
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
        "type": "github"
      },
      "original": {
@@ -493,11 +559,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
@@ -509,11 +575,27 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1718714799,
+        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
        "type": "github"
      },
      "original": {
@@ -523,17 +605,17 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1686020360,
-        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
-        "owner": "NixOS",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -554,11 +636,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1724010176,
-        "narHash": "sha256-26fas5WqF8w1PMrMuJNde4bH6WSXFfRbh+L4krgPOzY=",
+        "lastModified": 1724968633,
+        "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "c52ba6785661f095221aa1e1eb24f57e89d7b2de",
+        "rev": "2704133fe3ca616b22ed6685cc67180456eb4160",
        "type": "github"
      },
      "original": {
@@ -567,21 +649,6 @@
        "type": "github"
      }
    },
-    "nurpkgs": {
-      "locked": {
-        "lastModified": 1724012881,
-        "narHash": "sha256-lqn4UX+tvtwOmBZ2Dxh6euXKNcXGEYqPolEdjtONDVY=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "8c7136cb22fd96cde881225863b450df75876ebc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
    "nuschtosSearch": {
      "inputs": {
        "flake-utils": "flake-utils_2",
@@ -591,11 +658,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723367906,
-        "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
+        "lastModified": 1724584782,
+        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
+        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
        "type": "github"
      },
      "original": {
@@ -621,10 +688,11 @@
        "apple-fonts": "apple-fonts",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
+        "hyprpanel": "hyprpanel",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
        "nixvim": "nixvim",
-        "nurpkgs": "nurpkgs",
        "sops-nix": "sops-nix",
        "spicetify-nix": "spicetify-nix"
      }
@@ -700,19 +768,21 @@
    },
    "spicetify-nix": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1704167711,
-        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
-        "owner": "the-argus",
+        "lastModified": 1724991403,
+        "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=",
+        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05",
        "type": "github"
      },
      "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
        "repo": "spicetify-nix",
        "type": "github"
      }
@@ -749,16 +819,16 @@
    },
    "systems_3": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
        "type": "github"
      }
    },
@@ -785,11 +855,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723454642,
-        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
+        "lastModified": 1724833132,
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
        "type": "github"
      },
      "original": {
@@ -815,11 +885,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722365976,
-        "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
+        "lastModified": 1724073926,
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -16,54 +16,45 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    sops-nix = {
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nurpkgs.url = "github:nix-community/NUR";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
  };

  outputs = inputs@{ nixpkgs, ... }: {
    nixosConfigurations = {
-
-      nixy = nixpkgs.lib.nixosSystem { # CHANGE ME
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
        system = "x86_64-linux";
        modules = [
-          ./hosts/laptop/configuration.nix # CHANGE ME
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGE ME
-          inputs.home-manager.nixosModules.home-manager
          {
-            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./hosts/laptop/home.nix; # CHANGE ME
-              extraSpecialArgs = { inherit inputs; };
-            };
          }
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/laptop/configuration.nix # CHANGEME
        ];
      };

      jack = nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
        modules = [
+          { _module.args = { inherit inputs; }; }
          inputs.sops-nix.nixosModules.sops
-          ./hosts/server/configuration.nix
          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./hosts/server/home.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
+          ./hosts/server/configuration.nix
        ];
      };

--- a/home/programs/lf/config/colors
+++ b/home/programs/lf/config/colors
@@ -1,174 +0,0 @@
-# vim:ft=dircolors
-# (This is not a dircolors file but it helps to highlight colors and comments)
-
-# default values from dircolors
-# (entries with a leading # are not implemented in lf)
-# #no     00              # NORMAL
-# fi      00              # FILE
-# #rs     0               # RESET
-# di      01;34           # DIR
-# ln      01;36           # LINK
-# #mh     00              # MULTIHARDLINK
-# pi      40;33           # FIFO
-# so      01;35           # SOCK
-# #do     01;35           # DOOR
-# bd      40;33;01        # BLK
-# cd      40;33;01        # CHR
-# or      40;31;01        # ORPHAN
-# #mi     00              # MISSING
-# su      37;41           # SETUID
-# sg      30;43           # SETGID
-# #ca     30;41           # CAPABILITY
-# tw      30;42           # STICKY_OTHER_WRITABLE
-# ow      34;42           # OTHER_WRITABLE
-# st      37;44           # STICKY
-# ex      01;32           # EXEC
-
-# default values from lf (with matching order)
-# ln      01;36   # LINK
-# or      31;01   # ORPHAN
-# tw      01;34   # STICKY_OTHER_WRITABLE
-# ow      01;34   # OTHER_WRITABLE
-# st      01;34   # STICKY
-# di      01;34   # DIR
-# pi      33      # FIFO
-# so      01;35   # SOCK
-# bd      33;01   # BLK
-# cd      33;01   # CHR
-# su      01;32   # SETUID
-# sg      01;32   # SETGID
-# ex      01;32   # EXEC
-# fi      00      # FILE
-
-# file types (with matching order)
-ln      01;36   # LINK
-or      31;01   # ORPHAN
-tw      34      # STICKY_OTHER_WRITABLE
-ow      34      # OTHER_WRITABLE
-st      01;34   # STICKY
-di      01;34   # DIR
-pi      33      # FIFO
-so      01;35   # SOCK
-bd      33;01   # BLK
-cd      33;01   # CHR
-su      01;32   # SETUID
-sg      01;32   # SETGID
-ex      01;32   # EXEC
-fi      00      # FILE
-
-# archives or compressed (dircolors defaults)
-*.tar   01;31
-*.tgz   01;31
-*.arc   01;31
-*.arj   01;31
-*.taz   01;31
-*.lha   01;31
-*.lz4   01;31
-*.lzh   01;31
-*.lzma  01;31
-*.tlz   01;31
-*.txz   01;31
-*.tzo   01;31
-*.t7z   01;31
-*.zip   01;31
-*.z     01;31
-*.dz    01;31
-*.gz    01;31
-*.lrz   01;31
-*.lz    01;31
-*.lzo   01;31
-*.xz    01;31
-*.zst   01;31
-*.tzst  01;31
-*.bz2   01;31
-*.bz    01;31
-*.tbz   01;31
-*.tbz2  01;31
-*.tz    01;31
-*.deb   01;31
-*.rpm   01;31
-*.jar   01;31
-*.war   01;31
-*.ear   01;31
-*.sar   01;31
-*.rar   01;31
-*.alz   01;31
-*.ace   01;31
-*.zoo   01;31
-*.cpio  01;31
-*.7z    01;31
-*.rz    01;31
-*.cab   01;31
-*.wim   01;31
-*.swm   01;31
-*.dwm   01;31
-*.esd   01;31
-
-# image formats (dircolors defaults)
-*.jpg   01;35
-*.jpeg  01;35
-*.mjpg  01;35
-*.mjpeg 01;35
-*.gif   01;35
-*.bmp   01;35
-*.pbm   01;35
-*.pgm   01;35
-*.ppm   01;35
-*.tga   01;35
-*.xbm   01;35
-*.xpm   01;35
-*.tif   01;35
-*.tiff  01;35
-*.png   01;35
-*.svg   01;35
-*.svgz  01;35
-*.mng   01;35
-*.pcx   01;35
-*.mov   01;35
-*.mpg   01;35
-*.mpeg  01;35
-*.m2v   01;35
-*.mkv   01;35
-*.webm  01;35
-*.ogm   01;35
-*.mp4   01;35
-*.m4v   01;35
-*.mp4v  01;35
-*.vob   01;35
-*.qt    01;35
-*.nuv   01;35
-*.wmv   01;35
-*.asf   01;35
-*.rm    01;35
-*.rmvb  01;35
-*.flc   01;35
-*.avi   01;35
-*.fli   01;35
-*.flv   01;35
-*.gl    01;35
-*.dl    01;35
-*.xcf   01;35
-*.xwd   01;35
-*.yuv   01;35
-*.cgm   01;35
-*.emf   01;35
-*.ogv   01;35
-*.ogx   01;35
-
-# audio formats (dircolors defaults)
-*.aac   00;36
-*.au    00;36
-*.flac  00;36
-*.m4a   00;36
-*.mid   00;36
-*.midi  00;36
-*.mka   00;36
-*.mp3   00;36
-*.mpc   00;36
-*.ogg   00;36
-*.ra    00;36
-*.wav   00;36
-*.oga   00;36
-*.opus  00;36
-*.spx   00;36
-*.xspf  00;36
--- a/home/programs/lf/config/icons
+++ b/home/programs/lf/config/icons
@@ -1,361 +0,0 @@
-# vim:ft=conf
-
-# These examples require Nerd Fonts or a compatible font to be used.
-# See https://www.nerdfonts.com for more information.
-
-# default values from lf (with matching order)
-# ln      l       # LINK
-# or      l       # ORPHAN
-# tw      t       # STICKY_OTHER_WRITABLE
-# ow      d       # OTHER_WRITABLE
-# st      t       # STICKY
-# di      d       # DIR
-# pi      p       # FIFO
-# so      s       # SOCK
-# bd      b       # BLK
-# cd      c       # CHR
-# su      u       # SETUID
-# sg      g       # SETGID
-# ex      x       # EXEC
-# fi      -       # FILE
-
-# file types (with matching order)
-ln             # LINK
-or             # ORPHAN
-tw      t       # STICKY_OTHER_WRITABLE
-ow             # OTHER_WRITABLE
-st      t       # STICKY
-di             # DIR
-pi      p       # FIFO
-so      s       # SOCK
-bd      b       # BLK
-cd      c       # CHR
-su      u       # SETUID
-sg      g       # SETGID
-ex             # EXEC
-fi             # FILE
-
-# file extensions (vim-devicons)
-*.styl          
-*.sass          
-*.scss          
-*.htm           
-*.html          
-*.slim          
-*.haml          
-*.ejs           
-*.css           
-*.less          
-*.md            
-*.mdx           
-*.markdown      
-*.rmd           
-*.json          
-*.webmanifest   
-*.js            
-*.mjs           
-*.jsx           
-*.rb            
-*.gemspec       
-*.rake          
-*.php           
-*.py            
-*.pyc           
-*.pyo           
-*.pyd           
-*.coffee        
-*.mustache      
-*.hbs           
-*.conf          
-*.ini           
-*.yml           
-*.yaml          
-*.toml          
-*.bat           
-*.mk            
-*.jpg           
-*.jpeg          
-*.bmp           
-*.png           
-*.webp          
-*.gif           
-*.ico           
-*.twig          
-*.cpp           
-*.c++           
-*.cxx           
-*.cc            
-*.cp            
-*.c             
-*.cs            󰌛
-*.h             
-*.hh            
-*.hpp           
-*.hxx           
-*.hs            
-*.lhs           
-*.nix           
-*.lua           
-*.java          
-*.sh            
-*.fish          
-*.bash          
-*.zsh           
-*.ksh           
-*.csh           
-*.awk           
-*.ps1           
-*.ml            λ
-*.mli           λ
-*.diff          
-*.db            
-*.sql           
-*.dump          
-*.clj           
-*.cljc          
-*.cljs          
-*.edn           
-*.scala         
-*.go            
-*.dart          
-*.xul           
-*.sln           
-*.suo           
-*.pl            
-*.pm            
-*.t             
-*.rss           
-'*.f#'          
-*.fsscript      
-*.fsx           
-*.fs            
-*.fsi           
-*.rs            
-*.rlib          
-*.d             
-*.erl           
-*.hrl           
-*.ex            
-*.exs           
-*.eex           
-*.leex          
-*.heex          
-*.vim           
-*.ai            
-*.psd           
-*.psb           
-*.ts            
-*.tsx           
-*.jl            
-*.pp            
-*.vue           
-*.elm           
-*.swift         
-*.xcplayground  
-*.tex           󰙩
-*.r             󰟔
-*.rproj         󰗆
-*.sol           󰡪
-*.pem           
-
-# file names (vim-devicons) (case-insensitive not supported in lf)
-*gruntfile.coffee       
-*gruntfile.js           
-*gruntfile.ls           
-*gulpfile.coffee        
-*gulpfile.js            
-*gulpfile.ls            
-*mix.lock               
-*dropbox                
-*.ds_store              
-*.gitconfig             
-*.gitignore             
-*.gitattributes         
-*.gitlab-ci.yml         
-*.bashrc                
-*.zshrc                 
-*.zshenv                
-*.zprofile              
-*.vimrc                 
-*.gvimrc                
-*_vimrc                 
-*_gvimrc                
-*.bashprofile           
-*favicon.ico            
-*license                
-*node_modules           
-*react.jsx              
-*procfile               
-*dockerfile             
-*docker-compose.yml     
-*docker-compose.yaml    
-*compose.yml            
-*compose.yaml           
-*rakefile               
-*config.ru              
-*gemfile                
-*makefile               
-*cmakelists.txt         
-*robots.txt             󰚩
-
-# file names (case-sensitive adaptations)
-*Gruntfile.coffee       
-*Gruntfile.js           
-*Gruntfile.ls           
-*Gulpfile.coffee        
-*Gulpfile.js            
-*Gulpfile.ls            
-*Dropbox                
-*.DS_Store              
-*LICENSE                
-*React.jsx              
-*Procfile               
-*Dockerfile             
-*Docker-compose.yml     
-*Docker-compose.yaml    
-*Rakefile               
-*Gemfile                
-*Makefile               
-*CMakeLists.txt         
-
-# file patterns (vim-devicons) (patterns not supported in lf)
-# .*jquery.*\.js$         
-# .*angular.*\.js$        
-# .*backbone.*\.js$       
-# .*require.*\.js$        
-# .*materialize.*\.js$    
-# .*materialize.*\.css$   
-# .*mootools.*\.js$       
-# .*vimrc.*               
-# Vagrantfile$            
-
-# file patterns (file name adaptations)
-*jquery.min.js          
-*angular.min.js         
-*backbone.min.js        
-*require.min.js         
-*materialize.min.js     
-*materialize.min.css    
-*mootools.min.js        
-*vimrc                  
-Vagrantfile             
-
-# archives or compressed (extensions from dircolors defaults)
-*.tar   
-*.tgz   
-*.arc   
-*.arj   
-*.taz   
-*.lha   
-*.lz4   
-*.lzh   
-*.lzma  
-*.tlz   
-*.txz   
-*.tzo   
-*.t7z   
-*.zip   
-*.z     
-*.dz    
-*.gz    
-*.lrz   
-*.lz    
-*.lzo   
-*.xz    
-*.zst   
-*.tzst  
-*.bz2   
-*.bz    
-*.tbz   
-*.tbz2  
-*.tz    
-*.deb   
-*.rpm   
-*.jar   
-*.war   
-*.ear   
-*.sar   
-*.rar   
-*.alz   
-*.ace   
-*.zoo   
-*.cpio  
-*.7z    
-*.rz    
-*.cab   
-*.wim   
-*.swm   
-*.dwm   
-*.esd   
-
-# image formats (extensions from dircolors defaults)
-*.jpg   
-*.jpeg  
-*.mjpg  
-*.mjpeg 
-*.gif   
-*.bmp   
-*.pbm   
-*.pgm   
-*.ppm   
-*.tga   
-*.xbm   
-*.xpm   
-*.tif   
-*.tiff  
-*.png   
-*.svg   
-*.svgz  
-*.mng   
-*.pcx   
-*.mov   
-*.mpg   
-*.mpeg  
-*.m2v   
-*.mkv   
-*.webm  
-*.ogm   
-*.mp4   
-*.m4v   
-*.mp4v  
-*.vob   
-*.qt    
-*.nuv   
-*.wmv   
-*.asf   
-*.rm    
-*.rmvb  
-*.flc   
-*.avi   
-*.fli   
-*.flv   
-*.gl    
-*.dl    
-*.xcf   
-*.xwd   
-*.yuv   
-*.cgm   
-*.emf   
-*.ogv   
-*.ogx   
-
-# audio formats (extensions from dircolors defaults)
-*.aac   
-*.au    
-*.flac  
-*.m4a   
-*.mid   
-*.midi  
-*.mka   
-*.mp3   
-*.mpc   
-*.ogg   
-*.ra    
-*.wav   
-*.oga   
-*.opus  
-*.spx   
-*.xspf  
-
-# other formats
-*.pdf   
--- a/home/programs/lf/default.nix
+++ b/home/programs/lf/default.nix
@@ -1,80 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ pistol ];
-
-  programs.lf = {
-    enable = true;
-
-    commands = {
-      dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"'';
-      editor-open = "$$EDITOR $f";
-      mkdir = ''
-        ''${{
-          printf "Directory Name: "
-          read DIR
-          mkdir $DIR
-        }}
-      '';
-    };
-
-    keybindings = {
-      d = "delete";
-      x = "cut";
-      "<enter>" = "open";
-      "<c-g>" = "quit";
-      "<esc>" = "quit";
-      "H" = "set hidden!";
-      "\\\"" = "";
-      o = "";
-      c = "mkdir";
-      "." = "set hidden!";
-      "`" = "mark-load";
-      "\\'" = "mark-load";
-      "g~" = "cd";
-      do = "dragon-out";
-      gh = "cd";
-      "g/" = "/";
-      ee = "editor-open";
-      V = ''$''${pkgs.bat}/bin/bat --paging=always "$f"'';
-    };
-
-    settings = {
-      ratios = [ 1 1 2 ];
-      preview = true;
-      hidden = true;
-      drawbox = true;
-      icons = true;
-      ignorecase = true;
-      incsearch = true;
-    };
-
-    previewer.source = "${pkgs.pistol}/bin/pistol";
-
-    extraConfig = let
-      previewer = pkgs.writeShellScriptBin "pv.sh" ''
-        file=$1
-        w=$2
-        h=$3
-        x=$4
-        y=$5
-
-        if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then
-            ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty
-            exit 1
-        fi
-
-        ${pkgs.pistol}/bin/pistol "$file"
-      '';
-      cleaner = pkgs.writeShellScriptBin "clean.sh" ''
-        ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty
-      '';
-    in ''
-      set cleaner ${cleaner}/bin/clean.sh
-      set previewer ${previewer}/bin/pv.sh
-    '';
-  };
-
-  xdg.configFile."lf" = {
-    recursive = true;
-    source = ./config;
-  };
-}
--- a/home/programs/nvim/plugins/lsp.nix
+++ b/home/programs/nvim/plugins/lsp.nix
@@ -9,7 +9,7 @@
        gopls.enable = true;
        nixd.enable = true;
        tailwindcss.enable = true;
-        html.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
        svelte.enable = true;
        marksman.enable = true;
        ltex = {
--- a/home/programs/nvim/plugins/ui.nix
+++ b/home/programs/nvim/plugins/ui.nix
@@ -1,6 +1,13 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
  home.packages = with pkgs; [ ctags ];
+
  programs.nixvim = {
+    highlight = {
+      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bold = true;
+      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bold = true;
+    };
    plugins = {
      lualine.enable = true;
      noice.enable = true;
@@ -10,17 +17,22 @@
      };
      bufferline.enable = true;
      trouble.enable = true;
+      indent-blankline.enable = true;
      which-key.enable = true;
      headlines = {
        enable = true;
        settings = {
          markdown = {
-            codeblock_highlight = false;
+            headline_highlights = [ "Headline1" "Headline" ];
+            fat_headlines = false;
+            bullets = [ "" "◉" "○" "✸" ];
+            dash_string = "";
+            codeblock_highlight = "Headline";
          };
        };
      };
      nvim-colorizer.enable = true;
-      # tagbar.enable = true;
+      tagbar.enable = true; # FIXME: Tagbar is not working
    };
    keymaps = [{
      key = "<leader>t";
--- a/home/programs/qutebrowser/default.nix
+++ b/home/programs/qutebrowser/default.nix
@@ -73,10 +73,7 @@ let

 in {

-  imports = [
-    ./duckduckgo-colorscheme.nix
-    # ./userscripts.nix
-  ];
+  imports = [ ./duckduckgo-colorscheme.nix ];

  programs.qutebrowser = {
    enable = true;
--- a/home/programs/qutebrowser/userscripts.nix
+++ b/home/programs/qutebrowser/userscripts.nix
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    keyutils
-    python3
-    python311Packages.pyperclip
-    python312Packages.tldextract
-  ];
-
-  xdg.configFile."qutebrowser/userscripts/bitwarden" = {
-    source = ./userscripts/qute-bitwarden.py;
-    executable = true;
-  };
-}
--- a/home/programs/qutebrowser/userscripts/qute-bitwarden.py
+++ b/home/programs/qutebrowser/userscripts/qute-bitwarden.py
@@ -1,291 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-FileCopyrightText: Chris Braun (cryzed) <cryzed@googlemail.com>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""
-Insert login information using Bitwarden CLI and a dmenu-compatible application
-(e.g. dmenu, rofi -dmenu, ...).
-"""
-
-USAGE = """The domain of the site has to be in the name of the Bitwarden entry, for example: "github.com/cryzed" or
-"websites/github.com".  The login information is inserted by emulating key events using qutebrowser's fake-key command in this manner:
-[USERNAME]<Tab>[PASSWORD], which is compatible with almost all login forms.
-
-If enabled, with the `--totp` flag, it will also move the TOTP code to the
-clipboard, much like the Firefox add-on.
-
-You must log into Bitwarden CLI using `bw login` prior to use of this script.
-The session key will be stored using keyctl for the number of seconds passed to
-the --auto-lock option.
-
-To use in qutebrowser, run: `spawn --userscript qute-bitwarden`
-"""
-
-EPILOG = """Dependencies: tldextract (Python 3 module), pyperclip (optional
-Python module, used for TOTP codes), Bitwarden CLI (1.7.4 is known to work
-but older versions may well also work)
-
-WARNING: The login details are viewable as plaintext in qutebrowser's debug log
-(qute://log) and might be shared if you decide to submit a crash report!"""
-
-import argparse
-import enum
-import functools
-import os
-import shlex
-import subprocess
-import sys
-import json
-import tldextract
-
-argument_parser = argparse.ArgumentParser(
-    description=__doc__,
-    usage=USAGE,
-    epilog=EPILOG,
-)
-argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
-argument_parser.add_argument('--dmenu-invocation', '-d', default='wofi --dmenu -i',
-                             help='Invocation used to execute a dmenu-provider')
-argument_parser.add_argument('--password-prompt-invocation', '-p', default='rofi -dmenu -p "Master Password" -password -lines 0',
-                             help='Invocation used to prompt the user for their Bitwarden password')
-argument_parser.add_argument('--no-insert-mode', '-n', dest='insert_mode', action='store_false',
-                             help="Don't automatically enter insert mode")
-argument_parser.add_argument('--totp', '-t', action='store_true',
-                             help="Copy TOTP key to clipboard")
-argument_parser.add_argument('--io-encoding', '-i', default='UTF-8',
-                             help='Encoding used to communicate with subprocesses')
-argument_parser.add_argument('--merge-candidates', '-m', action='store_true',
-                             help='Merge pass candidates for fully-qualified and registered domain name')
-argument_parser.add_argument('--auto-lock', type=int, default=900,
-                             help='Automatically lock the vault after this many seconds')
-group = argument_parser.add_mutually_exclusive_group()
-group.add_argument('--username-only', '-e',
-                   action='store_true', help='Only insert username')
-group.add_argument('--password-only', '-w',
-                   action='store_true', help='Only insert password')
-group.add_argument('--totp-only', '-T',
-                   action='store_true', help='Only insert totp code')
-
-stderr = functools.partial(print, file=sys.stderr)
-
-
-class ExitCodes(enum.IntEnum):
-    SUCCESS = 0
-    FAILURE = 1
-    # 1 is automatically used if Python throws an exception
-    NO_PASS_CANDIDATES = 2
-    COULD_NOT_MATCH_USERNAME = 3
-    COULD_NOT_MATCH_PASSWORD = 4
-
-
-def qute_command(command):
-    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
-        fifo.write(command + '\n')
-        fifo.flush()
-
-
-def ask_password(password_prompt_invocation):
-    process = subprocess.run(
-        shlex.split(password_prompt_invocation),
-        text=True,
-        stdout=subprocess.PIPE,
-    )
-    if process.returncode > 0:
-        raise Exception('Could not unlock vault')
-    master_pass = process.stdout.strip()
-    return subprocess.check_output(
-        ['bw', 'unlock', '--raw', master_pass],
-        text=True,
-    ).strip()
-
-
-def get_session_key(auto_lock, password_prompt_invocation):
-    if auto_lock == 0:
-        subprocess.call(['keyctl', 'purge', 'user', 'bw_session'])
-        return ask_password(password_prompt_invocation)
-    else:
-        process = subprocess.run(
-            ['keyctl', 'request', 'user', 'bw_session'],
-            text=True,
-            stdout=subprocess.PIPE,
-        )
-        key_id = process.stdout.strip()
-        if process.returncode > 0:
-            session = ask_password(password_prompt_invocation)
-            if not session:
-                raise Exception('Could not unlock vault')
-            key_id = subprocess.check_output(
-                ['keyctl', 'add', 'user', 'bw_session', session, '@u'],
-                text=True,
-            ).strip()
-
-        if auto_lock > 0:
-            subprocess.call(['keyctl', 'timeout', str(key_id), str(auto_lock)])
-        return subprocess.check_output(
-            ['keyctl', 'pipe', str(key_id)],
-            text=True,
-        ).strip()
-
-
-def pass_(domain, encoding, auto_lock, password_prompt_invocation):
-    session_key = get_session_key(auto_lock, password_prompt_invocation)
-    process = subprocess.run(
-        ['bw', 'list', 'items', '--session', session_key, '--url', domain],
-        capture_output=True,
-    )
-
-    err = process.stderr.decode(encoding).strip()
-    if err:
-        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain, err)
-        stderr(msg)
-
-    if process.returncode:
-        return '[]'
-
-    out = process.stdout.decode(encoding).strip()
-
-    return out
-
-
-def get_totp_code(selection_id, domain_name, encoding, auto_lock, password_prompt_invocation):
-    session_key = get_session_key(auto_lock, password_prompt_invocation)
-    process = subprocess.run(
-        ['bw', 'get', 'totp', '--session', session_key, selection_id],
-        capture_output=True,
-    )
-
-    err = process.stderr.decode(encoding).strip()
-    if err:
-        # domain_name instead of selection_id to make it more user-friendly
-        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain_name, err)
-        stderr(msg)
-
-    if process.returncode:
-        return '[]'
-
-    out = process.stdout.decode(encoding).strip()
-
-    return out
-
-
-def dmenu(items, invocation, encoding):
-    command = shlex.split(invocation)
-    process = subprocess.run(command, input='\n'.join(
-        items).encode(encoding), stdout=subprocess.PIPE)
-    return process.stdout.decode(encoding).strip()
-
-
-def fake_key_raw(text):
-    for character in text:
-        # Escape all characters by default, space requires special handling
-        sequence = '" "' if character == ' ' else r'\{}'.format(character)
-        qute_command('fake-key {}'.format(sequence))
-
-
-def main(arguments):
-    if not arguments.url:
-        argument_parser.print_help()
-        return ExitCodes.FAILURE
-
-    extract_result = tldextract.extract(arguments.url)
-
-    # Try to find candidates using targets in the following order: fully-qualified domain name (includes subdomains),
-    # the registered domain name and finally: the IPv4 address if that's what
-    # the URL represents
-    candidates = []
-    for target in filter(None, [
-                extract_result.fqdn,
-                extract_result.registered_domain,
-                extract_result.subdomain + '.' + extract_result.domain,
-                extract_result.domain,
-                extract_result.ipv4]):
-        target_candidates = json.loads(
-            pass_(
-                target,
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-        if not target_candidates:
-            continue
-
-        candidates = candidates + target_candidates
-        if not arguments.merge_candidates:
-            break
-    else:
-        if not candidates:
-            stderr('No pass candidates for URL {!r} found!'.format(
-                arguments.url))
-            return ExitCodes.NO_PASS_CANDIDATES
-
-    if len(candidates) == 1:
-        selection = candidates.pop()
-    else:
-        choices = ['{:s} | {:s}'.format(c['name'], c['login']['username']) for c in candidates]
-        choice = dmenu(choices, arguments.dmenu_invocation, arguments.io_encoding)
-        choice_tokens = choice.split('|')
-        choice_name = choice_tokens[0].strip()
-        choice_username = choice_tokens[1].strip()
-        selection = next((c for (i, c) in enumerate(candidates)
-                          if c['name'] == choice_name
-                          and c['login']['username'] == choice_username),
-                         None)
-
-    # Nothing was selected, simply return
-    if not selection:
-        return ExitCodes.SUCCESS
-
-    username = selection['login']['username']
-    password = selection['login']['password']
-    totp = selection['login']['totp']
-
-    if arguments.username_only:
-        fake_key_raw(username)
-    elif arguments.password_only:
-        fake_key_raw(password)
-    elif arguments.totp_only:
-        # No point in moving it to the clipboard in this case
-        fake_key_raw(
-            get_totp_code(
-                selection['id'],
-                selection['name'],
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-    else:
-        # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
-        # back into insert-mode, so the form can be directly submitted by
-        # hitting enter afterwards
-        fake_key_raw(username)
-        qute_command('fake-key <Tab>')
-        fake_key_raw(password)
-
-    if arguments.insert_mode:
-        qute_command('mode-enter insert')
-
-    # If it finds a TOTP code, it copies it to the clipboard,
-    # which is the same behavior as the Firefox add-on.
-    if not arguments.totp_only and totp and arguments.totp:
-        # The import is done here, to make pyperclip an optional dependency
-        import pyperclip
-        pyperclip.copy(
-            get_totp_code(
-                selection['id'],
-                selection['name'],
-                arguments.io_encoding,
-                arguments.auto_lock,
-                arguments.password_prompt_invocation,
-            )
-        )
-
-    return ExitCodes.SUCCESS
-
-
-if __name__ == '__main__':
-    arguments = argument_parser.parse_args()
-    sys.exit(main(arguments))
--- a/home/programs/shell/zsh.nix
+++ b/home/programs/shell/zsh.nix
@@ -60,7 +60,7 @@
      ga = "git add";
      gc = "git commit";
      gcm = "git commit -m";
-      gcu = "git commit -am 'Update'";
+      gcu = "git add . && git commit -m 'Update'";
      gp = "git push";
      gpl = "git pull";
      gs = "git status";
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -1,5 +1,5 @@
 { pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in {

  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
@@ -33,6 +33,7 @@ in {
      lastfm
      historyShortcut
      hidePodcasts
+      adblock
      fullAppDisplay
      shuffle
    ];
--- a/home/scripts/battery/default.nix
+++ b/home/scripts/battery/default.nix
@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-let
-  battery-watch = pkgs.writeShellScriptBin "battery-watch" ''
-    while true;do
-      battery-plugged &
-      battery-level &
-      sleep 60
-    done
-  '';
-
-  battery-plugged = pkgs.writeShellScriptBin "battery-plugged" ''
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    OLD_BATTERY_STATUS=$(cat /tmp/old_battery_status 2>/dev/null || echo "Unknown")
-    if [[ $BATTERY_STATUS != $OLD_BATTERY_STATUS && $OLD_BATTERY_STATUS != "Unknown" ]]; then
-      if [[ $BATTERY_STATUS == "Discharging" ]]; then
-        notif "battery" "󰚦 Battery is unplugged"
-      else
-        notif "battery" "󰚥 Battery is plugged in"
-      fi
-    fi
-    echo $BATTERY_STATUS > /tmp/old_battery_status
-  '';
-
-  battery-level = pkgs.writeShellScriptBin "battery-level" ''
-    BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity | head -n1)
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    if [[ $BATTERY_LEVEL -le 20 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      notif "battery" "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      notif "battery" "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
-    # elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
-    #   notif "battery" "󰁹 Fully charged"
-    fi
-  '';
-
-in { home.packages = [ battery-watch battery-plugged battery-level ]; }
--- a/home/scripts/brightness/default.nix
+++ b/home/scripts/brightness/default.nix
@@ -4,16 +4,12 @@ let
  increments = "5";

  brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    sleep 0.05
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
+  '';

-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
-
-    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
-
-    message="󰃠  Brightness: $brightness_level%"
-
-    notif "brightness" "$message" "extraargs=-h int:value:$brightness_level"
+  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
+    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
  '';

  brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -24,4 +20,12 @@ let
    brightness-change down ${increments}
  '';

-in { home.packages = [ brightness-change brightness-up brightness-down ]; }
+in {
+  home.packages = [
+    pkgs.brightnessctl
+    brightness-change
+    brightness-up
+    brightness-down
+    brightness-set
+  ];
+}
--- a/home/scripts/caffeine/default.nix
+++ b/home/scripts/caffeine/default.nix
@@ -1,29 +1,25 @@
 { pkgs, ... }:
 let
  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ -f /tmp/caffeine ]] && echo "1" || echo "0"
-  '';
-
-  caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ -f /tmp/caffeine ]]; then
-      rm /tmp/caffeine
-      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
-      message="󰾪  Caffeine Deactivated"
-    else
-      touch /tmp/caffeine
-      pkill hypridle
-      message="󰅶  Caffeine Activated"
-    fi
-    notif "caffeine" "$message"
+    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
  '';

  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
-    status=$(caffeine-status)
-    if [[ $status == "1" ]]; then
-      echo "󰅶"
+    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
+  '';
+
+  caffeine = pkgs.writeShellScriptBin "caffeine" ''
+    if [[ $(pidof "hypridle") ]]; then
+      pkill hypridle
+      title="󰅶  Caffeine Activated"
+      description="Caffeine is now active! Your screen will not turn off automatically."
    else
-      echo "󰾪"
+      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      title="󰾪  Caffeine Deactivated"
+      description="Caffeine is now deactivated! Your screen will turn off automatically."
    fi
+
+    notif "caffeine" "$title" "$description"
  '';

 in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }
--- a/home/scripts/compress/default.nix
+++ b/home/scripts/compress/default.nix
@@ -1,22 +0,0 @@
-# From https://github.com/Frost-Phoenix/nixos-config
-{ pkgs, ... }:
-let
-  compress = pkgs.writeShellScriptBin "compress" ''
-    if (( $# == 1 )) then
-        # echo -ne "Archive name: "
-        # read name
-        # tar -cvzf "$name.tar.gz" $1
-        tar -cvzf "$1.tar.gz" $1
-    else
-        echo "Wrong number of arguments..."
-    fi
-  '';
-
-  extract = pkgs.writeShellScriptBin "extract" ''
-     for i in "$@" ; do
-        tar -xvzf $i
-        break
-    done 
-  '';
-
-in { home.packages = [ compress extract ]; }
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -6,12 +6,8 @@
    ./caffeine
    ./night-shift
    ./screenshot
-    ./startup
    ./nerdfont_fzf
    ./notification
-    ./battery
-    ./compress
-    ./misc
-    ./tofi
+    ./system
  ];
 }
--- a/home/scripts/nerdfont_fzf/default.nix
+++ b/home/scripts/nerdfont_fzf/default.nix
@@ -12,21 +12,15 @@ let
    fi

    echo "Copied to clipboard: $fzf_result"
-    echo "Paste it to close the window"
-    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
+    ${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result" # wait for paste before exiting.. not cool
  '';

  nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
    wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
    jq 'del(.METADATA)' "glyphnames.json"
  '';
-
-  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
-    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
-  '';
-
 in {
-  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];

  xdg.configFile."nerdfont_glyphnames.json" = {
    source = ./nerdfont_glyphnames.json;
--- a/home/scripts/nerdfont_fzf/nerdfont_glyphnames.json
+++ b/home/scripts/nerdfont_fzf/nerdfont_glyphnames.json
--- a/home/scripts/night-shift/default.nix
+++ b/home/scripts/night-shift/default.nix
@@ -4,19 +4,23 @@ let
  default = "4000";

  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
-    message="󰖔  Night-Shift Activated"
-    notif "night-shift" "$message"
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
+    title="󰖔  Night-Shift Activated"
+    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+
+    notif "night-shift" "$title" "$description"
  '';

  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    pkill wlsunset
-    message="󰖔  Night-Shift Deactivated"
-    notif "night-shift" "$message"
+    pkill gammastep
+    title="󰖕  Night-Shift Deactivated"
+    description="Night-Shift is now deactivated! Your screen will return to normal."
+
+    notif "night-shift" "$title" "$description"
  '';

  night-shift = pkgs.writeShellScriptBin "night-shift" ''
-    if pgrep wlsunset; then
+    if pgrep gammastep; then
      night-shift-off
    else
      night-shift-on
@@ -24,7 +28,7 @@ let
  '';

  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if [[ $(pgrep wlsunset) ]]; then
+    if [[ $(pgrep gammastep) ]]; then
      echo "1"
    else
      echo "0"
@@ -33,7 +37,7 @@ let

  night-shift-status-icon =
    pkgs.writeShellScriptBin "night-shift-status-icon" ''
-      if [[ $(pgrep wlsunset) ]]; then
+      if [[ $(pgrep gammastep) ]]; then
        echo "󰖔"
      else
        echo "󰖕"
@@ -41,6 +45,7 @@ let
    '';
 in {
  home.packages = [
+    pkgs.gammastep
    night-shift-on
    night-shift-off
    night-shift
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -1,7 +1,5 @@
 { pkgs, config, ... }:
-
 let
-
  nixy = pkgs.writeShellScriptBin "nixy" ''
    function exec() {
      $@
--- a/home/scripts/notification/default.nix
+++ b/home/scripts/notification/default.nix
@@ -1,27 +1,26 @@
 { pkgs, ... }:
 let
-  notif = pkgs.writeShellScriptBin "notif" ''
+  notif = pkgs.writeShellScriptBin "notif" # bash
+    ''
      # Shell script to send custom notifications
+      # Usage: notif "sender_id" "message" ["description"]
      NOTIF_FOLDER="/tmp/notif"
      sender_id=$1 # To overwrite existing notifications
-    message=$2
-    extraargs=""
-    description=""
-    if [[ $3 == "extraargs="* ]]; then
-      extraargs=$(echo "$3" | sed 's/extraargs=//g')
-    else
-      description="$3"
-      extraargs="$4"
-    fi
+      title=$2
+      description=$3

      [[ -d "$NOTIF_FOLDER" ]] || mkdir $NOTIF_FOLDER
-    [[ -f "$NOTIF_FOLDER/$sender_id" ]] || echo "0" > "$NOTIF_FOLDER/$sender_id"
+      [[ -f "$NOTIF_FOLDER/$sender_id" ]] || (echo "0" > "$NOTIF_FOLDER/$sender_id")

      old_notification_id=$(cat "$NOTIF_FOLDER/$sender_id")
+      [[ -z "$old_notification_id" ]] && old_notification_id=0

-     ${pkgs.libnotify}/bin/notify-send "$message" \
-     $extraargs \
-    --replace-id="$old_notification_id" --print-id > "$NOTIF_FOLDER/$sender_id"
+       ${pkgs.libnotify}/bin/notify-send \
+      --replace-id="$old_notification_id" --print-id \
+      --app-name="$sender_id" \
+      "$title" \
+      "$description" \
+      > "$NOTIF_FOLDER/$sender_id"
    '';

-in { home.packages = [ notif ]; }
+in { home.packages = [ pkgs.libnotify notif ]; }
--- a/home/scripts/screenshot/default.nix
+++ b/home/scripts/screenshot/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:

 let
-  # TODO: Broken - hypshot not working (jq error)
  screenshot = pkgs.writeShellScriptBin "screenshot" ''
    if [[ $2 == "swappy" ]];then
      folder="/tmp"
--- a/home/scripts/sounds/default.nix
+++ b/home/scripts/sounds/default.nix
@@ -1,38 +1,23 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:

 let
-  homedir = config.home.homeDirectory;
  increments = "5";

  sound-change = pkgs.writeShellScriptBin "sound-change" ''
-    sleep 0.05
-
    [[ $1 == "mute" ]] && wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%+"
-    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%-"
-
-    sink_info=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
-
-    volume=$(echo "$(echo "$sink_info" | awk '{print $2}' | sed 's/%//')*100" | bc -l | xargs printf "%.0f")
-    muted=false
-    if [[ $sink_info == *"MUTED"* ]]; then
-      muted=true
-    fi
-
-    message=""
-    if [ $muted = true ]; then
-      message="󰖁 Muted"
-    else
-      message="󰕾 Volume: $volume%"
-    fi
-
-    notif "sound" "$message" "extraargs=-h int:value:$volume"
+    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%+
+    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%-
+    [[ $1 == "set" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-100}%
  '';

  sound-up = pkgs.writeShellScriptBin "sound-up" ''
    sound-change up ${increments}
  '';

+  sound-set = pkgs.writeShellScriptBin "sound-set" ''
+    sound-change set ''${1-100}
+  '';
+
  sound-down = pkgs.writeShellScriptBin "sound-down" ''
    sound-change down ${increments}
  '';
@@ -40,47 +25,6 @@ let
  sound-toggle = pkgs.writeShellScriptBin "sound-toggle" ''
    sound-change mute
  '';
-
-  sound-output = pkgs.writeShellScriptBin "sound-output" ''
-      function parse_sinks(){
-        output=$(wpctl status)
-        sinks=($(echo "$output" | sed 's/ │  //' | awk '/Sinks:/ {flag=1; next} /^$/ {flag=0} flag' | sed 's/ /-/g'))
-
-        for sink in "''${sinks[@]}"; do
-
-          id=""
-          default=false
-          sink=$(echo "$sink" | sed 's/-/ /g')
-          sink_name=$(echo "$sink" | sed 's/\[vol:.*$//')
-
-          if [[ $sink_name == "*"* ]]; then
-            sink_name=$(echo "$sink_name" | sed 's/*//')
-            default=true
-          fi
-
-          id=$(echo "$sink_name" | cut -d'.' -f1)
-          sink_name=$(echo "$sink_name" | sed 's/^[ ]*//;s/[ ]*$//' )
-          sink_name=$(echo "$sink_name" | cut -d'.' -f2 )
-
-          if [[ $default == true ]];then
-            printf "*%s (%d)" "$sink_name" "$id"
-          else
-            printf " %s (%d)" "$sink_name" "$id"
-          fi
-          printf "\n"
-        done
-    }
-
-
-    choosed_sink=$(echo "$(parse_sinks)" | ${pkgs.fzf}/bin/fzf \
-      --border-label "Choose sound output" ) || exit 1
-
-    choosed_sink_id=$(echo "$choosed_sink" | sed 's/.*(\(.*\))/\1/')
-
-    wpctl set-default $choosed_sink_id
-  '';
-
 in {
-  home.packages =
-    [ sound-output sound-change sound-up sound-down sound-toggle ];
+  home.packages = [ sound-change sound-up sound-down sound-toggle sound-set ];
 }
--- a/home/scripts/startup/default.nix
+++ b/home/scripts/startup/default.nix
@@ -1,17 +0,0 @@
-# File runned at startup by Hyprland
-{ pkgs, config, ... }:
-let
-  startup = pkgs.writeShellScriptBin "startup" ''
-    # Startup is a script called by Hyprland on startup
-    # Because HM enabling services suck.
-
-    [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
-
-    battery-watch &
-    ${pkgs.waybar}/bin/waybar &
-
-
-    wlr-randr --output "Unknown-1" --off # FIX: REMOVE WEIRD GHOST MONITOR
-  '';
-
-in { home.packages = [ startup ]; }
--- a/home/scripts/system/default.nix
+++ b/home/scripts/system/default.nix
--- a/home/scripts/tofi/default.nix
+++ b/home/scripts/tofi/default.nix
@@ -1,62 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-
-  tofi = pkgs.writeShellScriptBin "tofi" ''
-    hyprexec="hyprctl dispatch exec"
-    function exec() {
-      $@
-    }
-
-    function ui(){
-      DEFAULT_ICON="󰘳"
-
-      # "icon;name;command"[]
-      apps=(
-        ";Nixy;nixy"
-        ";Nerdfont FZF;nerdfont-fzf"
-        ";Brightness Up;brightness-up"
-        ";Brightness Down;brightness-down"
-        ";Sound Up;sound-up"
-        ";Sound Down;sound-down"
-        ";Sound Toggle Mute;sound-toggle"
-        ";Sound Change Output;sound-output"
-        ";Caffeine;caffeine"
-        ";Night Shift Toggle;night-shift-toggle"
-        ";Firefox;$hyprexec firefox"
-        ";Qutebrowser;$hyprexec qutebrowser"
-        ";Kitty;$hyprexec kitty"
-        ";Thunar;$hyprexec thunar"
-        ";Powermenu;powermenu"
-        ";Wofi;menu"
-        ";Lock;lock"
-        ";Bitwarden;$hyprexec bitwarden"
-        ";Clock; peaclock"
-        ";Nextcloud;$hyprexec nextcloud"
-        ";Spotify;$hyprexec spotify"
-        ";Btop;btop"
-        ";Cava;cava"
-        ";Discord;$hyprexec discord"
-        ";Vlc;$hyprexec vlc"
-        ";Obsidian;$hyprexec obsidian"
-      )
-
-      # Apply default icons if empty:
-      for i in "''${!apps[@]}"; do
-        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
-      done
-
-      fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
-      [[ -z $fzf_result ]] && exit 0
-      fzf_result=''${fzf_result/ /;}
-      line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
-      command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
-
-      exec "$command"
-      exit 0
-    }
-
-    ui
-  '';
-
-in { home.packages = [ tofi ]; }
--- a/home/system/batsignal/default.nix
+++ b/home/system/batsignal/default.nix
@@ -0,0 +1,6 @@
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
+  };
+}
--- a/home/system/clipman/default.nix
+++ b/home/system/clipman/default.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+let
+
+  clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
+    clipman clear --all
+  '';
+
+  clipboard = pkgs.writeShellScriptBin "clipboard" ''
+    clipman pick --tool=wofi
+  '';
+
+in {
+  wayland.windowManager.hyprland.settings.exec-once =
+    [ "${clipboard-clear}" "wl-paste -t text --watch clipman store" ];
+  home.packages = with pkgs; [ clipman clipboard clipboard-clear ];
+  services.clipman.enable = true;
+
+}
--- a/home/system/dunst/default.nix
+++ b/home/system/dunst/default.nix
@@ -1,83 +0,0 @@
-{ config, pkgs, ... }: {
-
-  home.packages = with pkgs; [ libnotify ];
-
-  services.dunst = {
-    enable = true;
-    iconTheme = {
-      name = "Moka";
-      package = pkgs.moka-icon-theme;
-    };
-    settings = {
-      global = {
-        rounded = "yes";
-        origin = "top-center";
-        monitor = "0";
-        alignment = "center";
-        vertical_alignment = "center";
-        width = "400";
-        height = "400";
-        scale = 0;
-        gap_size = 0;
-        progress_bar = true;
-        transparency = 0;
-        text_icon_padding = 0;
-        separator_color = "frame";
-        sort = "yes";
-        idle_threshold = 120;
-        line_height = 0;
-        markup = "full";
-        show_age_threshold = 60;
-        ellipsize = "middle";
-        ignore_newline = "no";
-        stack_duplicates = true;
-        sticky_history = "yes";
-        history_length = 20;
-        always_run_script = true;
-        corner_radius = config.var.theme.rounding;
-        follow = "mouse";
-        font = config.var.theme.font;
-        format = "<b>%s</b>\\n%b";
-        progress_bar_corner_radius = config.var.theme.rounding - 10;
-        #format = ''
-        #  <span foreground='#${config.var.theme.colors.accent}'><b>%s %p</b></span>
-        #  %b'';
-        frame_color = "#" + config.var.theme.colors.bg;
-        highlight = "#" + config.var.theme.colors.accent;
-        foreground = "#" + config.var.theme.colors.fg;
-        frame_width = 1;
-        offset = "0x10";
-        horizontal_padding = 10;
-        icon_position = "left";
-        indicate_hidden = "yes";
-        min_icon_size = 0;
-        max_icon_size = 64;
-        mouse_left_click = "do_action, close_current";
-        mouse_middle_click = "close_current";
-        mouse_right_click = "close_all";
-        padding = 10;
-        plain_text = "no";
-        separator_height = 2;
-        show_indicators = "yes";
-        shrink = "no";
-        word_wrap = "yes";
-        browser = "${pkgs.qutebrowser}/bin/qutebrowser";
-      };
-
-      fullscreen_delay_everything = { fullscreen = "delay"; };
-
-      urgency_critical = {
-        background = "#" + config.var.theme.colors.c1;
-        foreground = "#" + config.var.theme.colors.c0;
-      };
-      urgency_low = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
-      };
-      urgency_normal = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
-      };
-    };
-  };
-}
--- a/home/system/gtk/default.nix
+++ b/home/system/gtk/default.nix
@@ -32,7 +32,34 @@
  home.file = {
    ".local/share/themes/FlatColor" = {
      recursive = true;
-      source = ./theme;
+      source = pkgs.stdenv.mkDerivation {
+        name = "FlatColor";
+
+        src = pkgs.fetchFromGitHub {
+          owner = "jasperro";
+          repo = "FlatColor";
+          rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
+          hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
+        };
+
+        buildPhase = ''
+          mkdir -p $out
+          # delete the default gtk-color-scheme:
+          file="./gtk-2.0/gtkrc"
+          sed -i '3,29d' $file
+          sed -i '3i include "../colors2"' $file
+
+          file="./gtk-3.0/gtk.css"
+          sed -i '2,10d' $file
+          sed -i '2i @import url("../colors3");' $file
+
+          file="./gtk-3.20/gtk.css"
+          sed -i '2,26d' $file
+          sed -i '2i @import url("../colors3");' $file
+
+          cp -r . $out 
+        '';
+      };
    };

    ".local/share/themes/FlatColor/colors2".text = ''
--- a/home/system/gtk/theme/gtk-2.0/gtkrc
+++ b/home/system/gtk/theme/gtk-2.0/gtkrc
@@ -1,771 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "include ../colors2"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = { 0, 0, 0, 0 }
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = { 1.0, 1.0 } # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }
-}
-
-style "murrine-wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "murrine-wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "murrine-thin" {
-	xthickness = 0
-	ythickness = 0
-}
-
-# Notebook
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-		border_shades = { 0.9, 0.9 }
-		trough_shades = { 0.97, 0.97 }
-		trough_border_shades = { 1.0, 1.0 }
-	}
-}
-
-style "murrine-overlay-scrollbar" {
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}
-
-style "murrine-scale" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {
-		roundness = 8
-		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
-		border_shades = { 1.0, 1.0 }
-		trough_shades = { 1.08, 1.08 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		roundness = 0
-		border_shades = { 1.2, 1.2 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-treeview" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-frame-title" {
-	fg[NORMAL] = lighter (@text_color)
-}
-
-style "murrine-tooltips" {
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}
-}
-
-style "murrine-spinbutton" = "murrine-button" {
-	engine "murrine" {
-	}
-}
-
-style "murrine-radiocheck" = "murrine-default" {
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}
-
-style "murrine-entry" = "murrine-wider" {
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {
-		border_shades = { 1.15, 1.15 }
-	}
-}
-
-style "metacity-frame" = "murrine-default" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "murrine-statusbar" { 
-  bg[NORMAL] = @bg_color
-}
-style "murrine-comboboxentry" = "murrine-entry" { }
-style "murrine-hscale" = "murrine-scale" { }
-style "murrine-vscale" = "murrine-scale" { }
-style "murrine-hscrollbar" = "murrine-scrollbar" { }
-style "murrine-vscrollbar" = "murrine-scrollbar" { }
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		textstyle = 0
-		border_shades = { 1.2, 1.2 }
-	}
-}
-
-style "murrine-separator-menu-item" = "murrine-thin" { }
-
-style "murrine-menubar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menubaritem" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-style "murrine-toolbutton" = "murrine-button" {
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-	}
-}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {
-	font_name = "Bold"
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "xfce-header" {
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}
-
-style "xfdesktop-windowlist" {
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}
-
-style "xfdesktop-icon-view" {
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {
-		textstyle = 5
-		text_shade = 0.05
-	}
-}
-
-style "xfwm-tabwin" {
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-		focusstyle = 0
-	}
-}
-
-style "xfsm-logout" {
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-	}
-}
-
-style "xfsm-logout-button" {
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {
-	}
-}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {
-	engine "murrine" {
-		roundness = 2
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame" {
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {
-	engine "murrine" {
-		toolbarstyle = 0
-	}
-}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {
-	engine "murrine" {
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-		highlight_shade = 1.0
-	}
-}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {
-	engine "murrine" {
-		textstyle = 0
-	}
-}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"
--- a/home/system/gtk/theme/gtk-2.0/gtkrc.base
+++ b/home/system/gtk/theme/gtk-2.0/gtkrc.base
@@ -1,797 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "bg_color:{color0}
-color0:{color0}
-color1:{color1}
-color2:{color2}
-color3:{color3}
-color4:{color4}
-color5:{color5}
-color6:{color6}
-color7:{color7}
-color8:{color8}
-color9:{color9}
-color10:{color10}
-color11:{color11}
-color12:{color12}
-color13:{color13}
-color14:{color14}
-color15:{color15}
-text_color:{color15}
-selected_bg_color:{active}
-selected_fg_color:{color15}
-tooltip_bg_color:{color0}
-tooltip_fg_color:{color15}
-titlebar_bg_color:{color0}
-titlebar_fg_color:{color15}
-menu_bg_color:{color0}
-menu_fg_color:{color15}
-link_color:{active}"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {{
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = {{ 0, 0, 0, 0 }}
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = {{ 1.0, 1.0 }} # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }} # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }}
-}}
-
-style "murrine-wide" {{
-	xthickness = 2
-	ythickness = 2
-}}
-
-style "murrine-wider" {{
-	xthickness = 3
-	ythickness = 3
-}}
-
-style "murrine-thin" {{
-	xthickness = 0
-	ythickness = 0
-}}
-
-# Notebook
-
-style "murrine-notebook-bg" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}}
-
-style "murrine-notebook" = "murrine-notebook-bg" {{
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {{
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {{
-	}}
-}}
-
-style "murrine-scrollbar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-		border_shades = {{ 0.9, 0.9 }}
-		trough_shades = {{ 0.97, 0.97 }}
-		trough_border_shades = {{ 1.0, 1.0 }}
-	}}
-}}
-
-style "murrine-overlay-scrollbar" {{
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}}
-
-style "murrine-scale" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {{
-		roundness = 8
-		gradient_shades = {{ 1.08, 1.08, 1.08, 1.08 }}
-		border_shades = {{ 1.0, 1.0 }}
-		trough_shades = {{ 1.08, 1.08 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-progressbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {{
-		roundness = 0
-		border_shades = {{ 1.2, 1.2 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-treeview-header" = "murrine-button" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-treeview" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-frame-title" {{
-	fg[NORMAL] = lighter (@text_color)
-}}
-
-style "murrine-tooltips" {{
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {{
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}}
-}}
-
-style "murrine-spinbutton" = "murrine-button" {{
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-radiocheck" = "murrine-default" {{
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}}
-
-style "murrine-entry" = "murrine-wider" {{
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {{
-		border_shades = {{ 1.15, 1.15 }}
-	}}
-}}
-
-style "metacity-frame" = "murrine-default" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "murrine-statusbar" {{ 
-  bg[NORMAL] = @bg_color
-}}
-style "murrine-comboboxentry" = "murrine-entry" {{ }}
-style "murrine-hscale" = "murrine-scale" {{ }}
-style "murrine-vscale" = "murrine-scale" {{ }}
-style "murrine-hscrollbar" = "murrine-scrollbar" {{ }}
-style "murrine-vscrollbar" = "murrine-scrollbar" {{ }}
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {{
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menu-item" = "murrine-wider" {{
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		textstyle = 0
-		border_shades = {{ 1.2, 1.2 }}
-	}}
-}}
-
-style "murrine-separator-menu-item" = "murrine-thin" {{ }}
-
-style "murrine-menubar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menubaritem" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-toolbutton" = "murrine-button" {{
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {{
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-	}}
-}}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {{
-	font_name = "Bold"
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "xfce-header" {{
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}}
-
-style "xfdesktop-windowlist" {{
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}}
-
-style "xfdesktop-icon-view" {{
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {{
-		textstyle = 5
-		text_shade = 0.05
-	}}
-}}
-
-style "xfwm-tabwin" {{
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-		focusstyle = 0
-	}}
-}}
-
-style "xfsm-logout" {{
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-	}}
-}}
-
-style "xfsm-logout-button" {{
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {{
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {{
-	engine "murrine" {{
-		roundness = 2
-		textstyle = 0
-	}}
-}}
-
-style "chrome-gtk-frame" {{
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {{
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {{
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {{
-	engine "murrine" {{
-		toolbarstyle = 0
-	}}
-}}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {{
-	engine "murrine" {{
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }}
-		highlight_shade = 1.0
-	}}
-}}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {{
-	engine "murrine" {{
-		textstyle = 0
-	}}
-}}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"
--- a/home/system/gtk/theme/gtk-3.0/assets/blank.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/blank.png
--- a/home/system/gtk/theme/gtk-3.0/assets/check-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/check-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/check-mixed-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/check-mixed-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/check-mixed.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/check-mixed.png
--- a/home/system/gtk/theme/gtk-3.0/assets/check.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/check.png
--- a/home/system/gtk/theme/gtk-3.0/assets/grid-selection-blank.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/grid-selection-blank.png
--- a/home/system/gtk/theme/gtk-3.0/assets/grid-selection.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/grid-selection.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-hover.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-hover.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked.png
--- a/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip-vertical.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip-vertical.png
--- a/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip.png
--- a/home/system/gtk/theme/gtk-3.0/assets/radio-checked.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/radio-checked.png
--- a/home/system/gtk/theme/gtk-3.0/assets/radio-insensitive.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/radio-insensitive.png
--- a/home/system/gtk/theme/gtk-3.0/assets/radio-unchecked.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/radio-unchecked.png
--- a/home/system/gtk/theme/gtk-3.0/assets/radio.png
+++ b/home/system/gtk/theme/gtk-3.0/assets/radio.png
--- a/home/system/gtk/theme/gtk-3.0/gnome-applications.css
+++ b/home/system/gtk/theme/gtk-3.0/gnome-applications.css
@@ -1,429 +0,0 @@
-/***********************
- * fallback mode panel *
- ***********************/
-PanelWidget,
-PanelApplet,
-PanelToplevel {
-    padding: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-PanelApplet {
-    border-width: 0;
-}
-
-PanelSeparator {
-    border-width: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelApplet > GtkMenuBar.menubar.menuitem,
-PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem {
-    -Panelpanel-icon-visible: true;
-
-    border-width: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-PanelAppletFrame {
-    border-width: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-PanelApplet .button {
-    -GtkButton-inner-border: 2;
-
-    border-width: 0;
-    border-radius: 0;
-    border-color: transparent;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-PanelApplet .button:active,
-PanelApplet .button:active:prelight {
-    border-width: 0 ;
-    border-radius: 0;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-PanelApplet .button:prelight {
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: shade(@theme_fg_color, 0.7);
-}
-
-WnckPager, WnckTasklist {
-    background-color: @theme_bg_color;
-}
-
-/************
- * nautilus *
- ************/
-.nautilus-canvas-item {
-    border-radius: 0;
-}
-
-.nautilus-desktop.nautilus-canvas-item {
-    color: white;
-    text-shadow: 1px 1px black;
-}
-
-.nautilus-desktop.nautilus-canvas-item:active {
-    color: @theme_fg_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected {
-    color: @theme_selected_fg_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
-.nautilus-desktop.nautilus-canvas-item:selected {
-    text-shadow: none;
-}
-
-NautilusWindow .toolbar {
-    border-width: 0;
-    border-style: none;
-}
-
-NautilusWindow .sidebar .frame {
-    border-style: none;
-}
-
-NautilusWindow > GtkGrid > .pane-separator,
-NautilusWindow > GtkGrid > .pane-separator:hover {
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-}
-
-NautilusNotebook.notebook tab {
-    padding: 0;
-}
-
-NautilusNotebook .frame {
-    border-width: 0;
-}
-
-NautilusQueryEditor .primary-toolbar.toolbar {
-    border-width: 0;
-}
-
-NautilusQueryEditor .toolbar {
-    border-width: 0;
-}
-
-NautilusQueryEditor .toolbar:nth-child(2) {
-
-}
-
-NautilusQueryEditor .toolbar:last-child,
-NautilusQueryEditor .primary-toolbar.toolbar:only-child {
-    border-width: 0;
-}
-
-/******************
- * gnome terminal *
- ******************/
-VteTerminal {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-TerminalWindow GtkNotebook.notebook {
-    border-width: 0;
-}
-
-TerminalWindow .scrollbars-junction,
-TerminalWindow .scrollbar.trough {
-
-}
-
-TerminalWindow .scrollbar.button,
-TerminalWindow .scrollbar.button:active,
-TerminalWindow .scrollbar.button:active:hover {
-
-}
-
-TerminalWindow .scrollbar.slider {
-
-}
-
-TerminalWindow .scrollbar.slider:hover,
-TerminalWindow .scrollbar.slider.vertical:hover {
- 
-}
-
-TerminalWindow .scrollbar.slider:active,
-TerminalWindow .scrollbar.slider.vertical:active {
-
-}
-
-/*********
- * gedit *
- *********/
-GeditWindow .pane-separator, 
-GeditWindow .pane-separator:hover {
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-}
-
-GeditPanel.title GtkLabel {
-    padding: 4px 0;
-}
-
-GeditPanel.vertical .title {
-    padding: 4px 0 4px 3px;
-    border-style: none;
-}
-
-GeditPanel .toolbar {
-    border-style: none;
-    background-color: transparent;
-}
-
-GeditDocumentsPanel .view {
-    background-color: @theme_base_color;
-}
-
-GeditPanel.vertical .notebook {
-    padding: 0;
-    border-width: 0;
-}
-
-GeditPanel.horizontal .notebook {
-    padding: 0;
-    border-width: 0;
-}
-
-GeditWindow .notebook {
-    border-width: 0;
-}
-
-GeditPanel .notebook tab,
-GeditWindow .notebook tab {
-    border-width: 0;
-}
-
-GeditStatusMenuButton {
-	color: @theme_fg_color;
-}
-
-GeditStatusMenuButton.button,
-GeditStatusMenuButton.button:hover,
-GeditStatusMenuButton.button:active,
-GeditStatusMenuButton.button:active:hover {
-	border-image: none;
-	color: @theme_fg_color;
-}
-
-GeditStatusMenuButton.button:hover,
-GeditStatusMenuButton.button:active,
-GeditStatusMenuButton.button:active:hover {
-
-}
-
-GeditStatusMenuButton.button:active {
-
-}
-
-GeditViewFrame .gedit-search-slider {
-    padding: 4px;
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-}
-GeditViewFrame .gedit-search-slider .entry {
-    padding: 6px 6px 7px 6px;
-}
-GeditViewFrame .gedit-search-slider .not-found {
-    background-color: @error_bg_color;
-    background-image: none;
-    color: @error_fg_color;
-}
-
-GeditViewFrame .gedit-search-slider .not-found:selected {
-    background-color: shade(@theme_selected_bg_color, 1.2);
-    color: @theme_selected_fg_color;
-}
-
-GeditFileBrowserWidget .primary-toolbar.toolbar  {
-    padding: 2px;
-    border: none;
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-.gedit-search-entry-occurrences-tag {
-        color: @theme_text_color;
-	margin: 2px;
-	padding: 2px;
-}
-/***************
- * font-viewer *
- ***************/
-SushiFontWidget {
-    padding: 6px 12px;
-}
-
-/*************
- * gucharmap *
- *************/
-GucharmapChartable {
-    background-color: @theme_base_color;
-}
-
-GucharmapChartable:active,
-GucharmapChartable:focus,
-GucharmapChartable:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-/* gnome-documents */
-.documents-dropdown,
-.documents-dropdown .view {
-	background-color: @theme_bg_color;
-}
-
-.documents-dropdown.frame {
-	padding: 6px;
-	border-width: 0;
-	border-style: none;
-}
-.documents-dropdown .view.radio,
-.documents-dropdown .view.radio:focus {
-	background-image: url("assets/blank.png");;
-	background-color: transparent;
-}
-
-.documents-dropdown .view.radio:active,
-.documents-dropdown .view.radio:active:focus,
-.documents-dropdown .view.radio:active:hover,
-.documents-dropdown .view.radio:hover {
-	background-color: transparent;
-	background-image: url("assets/radio-checked.png");
-}
-
-.documents-entry-tag {
-	background-color: transparent;
-	color: @theme_text_color;
-	border-width: 0;
-
-	margin: 2px;
-	padding: 4px;
-}
-
-.documents-entry-tag:hover {
-
-}
-
-.documents-entry-tag.button,
-.documents-entry-tag.button:focus,
-.documents-entry-tag.button:hover,
-.documents-entry-tag.button:hover:focus,
-.documents-entry-tag.button:active,
-.documents-entry-tag.button:active:focus {
-	background-color: transparent;
-	border-style: none;
-	box-shadow: none;
-	border-width: 0;
-
-}
-
-/* epiphany */
-
-
-
-/* evince */
-
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-    border-radius: 0;
-    border-width: 1px;
-    border-style: solid;
-    border-color: @theme_bg_color;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-    background-image: none;
-    border-image: none;
-}
-NemoPathbarButton:active {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-NemoPathbarButton:active:hover {
-    background-color: shade(@theme_selected_bg_color, 1.05);
-    color: @theme_selected_fg_color;
-}
-NemoPathbarButton:hover {
-    background-color: @theme_base_color;
-    color: shade(@theme_fg_color, 0.7);
-}
-
-NemoPathbarButton:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-NemoPathbarButton *:insensitive {
-
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 0.93);
-	-NemoPlacesTreeView-disk-full-fg-color: @theme_selected_bg_color;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 0.93);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_bg_color, 0.5);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-
-
-NemoWindow * {
-
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.3);
-}
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_bg_color, 1.03);
-}
--- a/home/system/gtk/theme/gtk-3.0/gtk-widgets-assets.css
+++ b/home/system/gtk/theme/gtk-3.0/gtk-widgets-assets.css
@@ -1,209 +0,0 @@
-/*******************
- * check and radio *
- *******************/
-/* draw regular check and radio items using our assets */
-.check,
-.check:hover,
-.check row:selected,
-.check row:selected:focus {
-    border-style: none;
-    border-radius: 0;
-    background-color: @button_normal_color;
-    background-image: url("assets/blank.png");
-}
-
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/blank.png");
-}
-
-.check:active,
-.check:active:hover,
-.check row:selected:active,
-.check row:selected:focus:active {
-    background-color: @theme_selected_bg_color;
-    background-image: url("assets/check.png");
-}
-
-.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/check-insensitive.png");
-}
-
-.check:inconsistent,
-.check:inconsistent:hover,
-.check:inconsistent:active:hover,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
-    background-color: @theme_selected_bg_color;
-    background-image: url("assets/check-mixed.png");
-}
-
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/check-mixed-insensitive.png");
-}
-.check row:selected:active,
-.check row:selected:focus:active {
-    box-shadow: inset 1px 1px @theme_selected_fg_color,
-                inset -1px -1px @theme_selected_fg_color;
-}
-
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-    box-shadow: none;
-}
-.radio,
-.radio:hover,
-.radio row:selected,
-.radio row:selected:focus {
-    border-style: none;
-    border-radius: 8px;
-    background-color: @button_normal_color;
-    background-image: url("assets/radio-unchecked.png");
-}
-
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/blank.png");
-}
-
-.radio:active,
-.radio:active:hover,
-.radio row:selected:active,
-.radio row:selected:focus:active {
-    background-color: @theme_selected_bg_color;
-    background-image: url("assets/radio.png");
-}
-
-.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/radio-insensitive.png");
-}
-
-.radio:inconsistent,
-.radio:inconsistent:hover,
-.radio:inconsistent:active:hover,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
-    background-color: @theme_selected_bg_color;
-    background-image: url("assets/check-mixed.png");
-}
-
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: url("assets/check-mixed-insensitive.png");
-}
-.radio row:selected:active,
-.radio row:selected:focus:active {
-    box-shadow: inset 1px 1px @theme_selected_fg_color,
-                inset -1px -1px @theme_selected_fg_color;
-}
-
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-    box-shadow: none;
-}
-.menuitem.check:active {
-    background-image: url("assets/menuitem-checkbox-checked.png");
-}
-
-.menuitem.check:active:hover {
-    background-image: url("assets/menuitem-checkbox-checked-hover.png");
-}
-
-.menuitem.check:active:insensitive {
-    background-image: url("assets/menuitem-checkbox-checked-insensitive.png");
-}
-
-.menuitem.check:inconsistent:hover,
-.menuitem.radio:inconsistent:hover {
-    background-image: url("assets/menuitem-checkbox-mixed-hover.png");
-}
-
-.menuitem.check:inconsistent,
-.menuitem.radio:inconsistent {
-    background-image: url("assets/menuitem-checkbox-mixed.png");
-}
-
-.menuitem.check:inconsistent:insensitive,
-.menuitem.radio:inconsistent:insensitive {
-    background-image: url("assets/menuitem-checkbox-mixed-insensitive.png");
-}
-
-.menuitem.radio:active {
-    background-image: url("assets/menuitem-radio-checked.png");
-}
-
-.menuitem.radio:active:hover {
-    background-image: url("assets/menuitem-radio-checked-hover.png");
-}
-
-.menuitem.radio:active:insensitive {
-    background-image: url("assets/menuitem-radio-checked-insensitive.png");
-}
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-GtkIconView.content-view.cell.check {
-    border-radius: 0;
-    background-color: @button_normal_color;
-    background-image: url("assets/grid-selection-blank.png");
-}
-
-GtkIconView.content-view.cell.check:active {
-    background-color: @theme_selected_bg_color;
-    background-image: url("assets/grid-selection.png");
-}
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover {
-	background-image: url("assets/radio-checked.png");
-}
-
-.sidebar .view.radio:hover {
-	background-image: url("assets/radio-checked.png");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus {
-	background-image: url("assets/radio.png");
-}
-
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
-	background-image: url("assets/radio.png");	
-}
-/******************
- * pane separator *
- ******************/
-.pane-separator.horizontal {
-    background-image: url("assets/pane-separator-grip.png");
-    background-repeat: no-repeat;
-    background-position: center center;
-}
-
-.pane-separator.vertical {
-    background-image: url("assets/pane-separator-grip-vertical.png");
-    background-repeat: no-repeat;
-    background-position: center center;
-}
--- a/home/system/gtk/theme/gtk-3.0/gtk-widgets.css
+++ b/home/system/gtk/theme/gtk-3.0/gtk-widgets.css
@@ -1,614 +0,0 @@
-/* NOTES to contributors:
- * use 4 spaces indents, and keep code ALIGNED and ORDERED */
-
-/* default */
-* {
-    engine: none;
-
-    background-clip: padding-box;
-
-    -GtkArrow-arrow-scaling: 0.55;
-    -GtkButton-child-displacement-x: 0;
-    -GtkButton-child-displacement-y: 0;
-    -GtkButton-default-border: 0;
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 1;
-    -GtkButton-interior-focus: true;
-    -GtkCheckButton-indicator-size: 16;
-    -GtkCheckMenuItem-indicator-size: 14;
-    -GtkExpander-expander-size: 8;
-    -GtkHTML-link-color: @link_color;
-    -GtkIMHtml-hyperlink-color: @link_color;
-    -GtkMenu-horizontal-padding: 0;
-    -GtkMenu-vertical-padding: 0;
-    -GtkNotebook-initial-gap: 0;
-    -GtkPaned-handle-size: 7;
-    -GtkProgressBar-min-horizontal-bar-height: 12;
-    -GtkProgressBar-min-vertical-bar-width: 12;
-    -GtkRange-slider-width: 10;
-    -GtkRange-stepper-spacing: 0;
-    -GtkRange-trough-border: 0;
-    -GtkRange-trough-under-steppers: 1;
-    -GtkScrollbar-has-backward-stepper: false;
-    -GtkScrollbar-has-forward-stepper: false;
-    -GtkScrollbar-min-slider-length: 50;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 0;
-    -GtkStatusbar-shadow-type: none;
-    -GtkTextView-error-underline-color: @error_color;
-    -GtkToolButton-icon-spacing: 6;
-    -GtkToolItemGroup-expander-size: 8;
-    -GtkTreeView-expander-size: 8;
-    -GtkWidget-focus-line-width: 0;
-    -GtkWidget-focus-padding: 2;
-    -GtkWidget-link-color: @link_color;
-    -GtkWidget-visited-link-color: @link_color;
-    -GtkWindow-resize-grip-height: 0;
-    -GtkWindow-resize-grip-width: 0;
-    -WnckTasklist-fade-overlay-rect: 0;
-    -GtkCheckButton-indicator-size: 16;
-    -GtkCheckMenuItem-indicator-size: 12;
-    -GtkWidget-wide-separators: true;
-    -GtkWidget-horizontal-separator: 0;
-    -GtkWidget-vertical-separator: 0;
-    outline-color: transparent;
-    outline-style: none;
-    outline-offset: 2px;
-}
-
-/***************
- * base states *
- ***************/
-.background {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-.background.client-decorated {
-    background-color: transparent;
-}
-
-.background.window-content {
-    background-color: @theme_bg_color;
-}
-
-GtkClutterOffscreen {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-*:selected,
-*:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-*:active {
-    background-color: shade(@theme_bg_color, 0.95);
-}
-
-*:insensitive,
-*:insensitive:insensitive {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-/* apply effects to insensitive and prelit images */
-*:insensitive {
-    -gtk-image-effect: dim;
-}
-
-*:hover {
-    -gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:prelight {
-    background-color: shade(@theme_bg_color, 1.1);
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:active {
-    background-color: shade(@theme_bg_color, 0.9);
-    color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:insensitive {
-    background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.gtkstyle-fallback:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-/******************
- * visual effects *
- ******************/
-/* transitions */
-.button {
-
-
-}
-
-.entry {
-
-}
-
-.entry:focus {
-
-}
-
-/* inset shadows */
-.button:active,
-.primary-toolbar .button:active,
-.toolbar .button:active,
-.header-bar .button:active {
-
-}
-
-
-/* disable inset shadow */
-.floating-bar .button:active,
-.button:active *:insensitive,
-.primary-toolbar .button:active *:insensitive,
-.toolbar .button:active *:insensitive,
-.header-bar .button:active *:insensitive{
-
-}
-
-/*************
- * assistant *
- *************/
-GtkAssistant .sidebar .highlight {
-	background-color: @theme_selected_bg_color;
-    font: bold;
-}
-
-GtkAssistant .sidebar {
-    padding: 0px;
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-/***********************
-! Font and file choosers
-************************/
-GtkFontButton .separator, GtkFileChooserButton .separator {
-  /* always disable separators */
-  -GtkWidget-wide-separators: false;
-  -GtkWidget-horizontal-separator: 0;
-  -GtkWidget-vertical-separator: 0; }
-
-GtkFileChooser {
-  /* for fallback when header bar not used */ }
-  GtkFileChooser .pane-separator, GtkFileChooser .pane-separator:hover {
-    border-width: 0 0px 0 0;
-    border-style: solid;
-    border-color: @theme_bg_color;
-    background-color: #f0f0f0;
-    color: #d8d8d8; }
-  GtkFileChooser .dialog-action-box {
-    border-width: 1px 0 0;
-    border-style: solid;
-    border-color: #202020; }
-  GtkFileChooser .sidebar.list,
-  .sidebar.list .button{
-    background-color: @theme_bg_color;
-  }
-  .sidebar.list :active,
-  .sidebar.list :focus *{
-	  background-color: @theme_selected_bg_color;
-  }
-GtkFileChooserWidget.vertical GtkPaned.horizontal {
-    -GtkPaned-handle-size: 1px;
-} 
-
-
-/****************
- * content view *
- ****************/
-.content-view.view {
-    background-color: @theme_base_color;
-}
-
-.content-view.view:prelight {
-    background-color: alpha(@theme_selected_bg_color, 0.3);
-}
-
-.content-view.view:selected,
-.content-view.view:active {
-    background-color: @theme_selected_bg_color;
-}
-
-.content-view.view:insensitive {
-    background-color: @entry_border_color;
-}
-
-GdMainIconView.content-view {
-    -GdMainIconView-icon-size: 40;
-}
-
-GtkIconView.content-view.check {
-    background-color: transparent;
-}
-
-GtkIconView.content-view.check:active {
-    background-color: transparent;
-}
-
-.content-view.view.check,
-.content-view.view.check:active {
-    background-color: transparent;
-}
-
-GtkIconView.content-view.check:prelight,
-GtkIconView.content-view.check:insensitive,
-GtkIconView.content-view.check:selected {
-    background-color: transparent;
-}
-
-/****************
- * drawing area *
- ****************/
-GtkDrawingArea {
-    background-color: transparent;
-}
-
-GtkDrawingArea:insensitive {
-    background-color: @entry_border_color;
-}
-
-/***********
- * gtkhtml *
- ***********/
-GtkHTML {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-
-
-
-
-/************
- * expander *
- ************/
-.expander {
-    color: alpha(@theme_fg_color, 0.7);
-}
-
-.expander:hover {
-    color: alpha(@theme_fg_color, 0.9);
-}
-
-/*********
- * frame *
- *********/
-
-.frame {
-    border-radius: 0;
-    border-width:  0;
-    border-style: none;
-}
-
-/*******************
- * scrolled window *
- *******************/
-GtkScrolledWindow.frame {
-    border-radius: 0;
-    border-width:  0;
-    border-style: none;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-    border-style: none;
-}
-
-
-/************
- * iconview *
- ************/
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focus {
-    border-width: 3px;
-    border-style: solid;
-    border-color: @theme_selected_bg_color;
-    border-radius: 0;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.content-view.view.rubberband,
-.view.rubberband,
-.rubberband {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0;
-    background-color: alpha(@theme_selected_bg_color, 0.3);
-}
-
-/*********
- * image *
- *********/
-GtkImage,
-GtkImage:active,
-GtkImage:insensitive {
-    background-color: transparent;
-}
-
-/*********
- * label *
- *********/
-GtkLabel,
-GtkLabel:active,
-GtkLabel:insensitive {
-    background-color: transparent;
-}
-
-/*******************
- * symbolic images *
- *******************/
-.image,
-.view.image {
-    color: alpha(@theme_fg_color, 0.5);
-}
-
-.image:hover,
-.view.image:hover {
-    color: @theme_fg_color;
-}
-
-.image:selected,
-.image:selected:hover,
-.view.image:selected,
-.view.image:selected:hover {
-    color: @theme_selected_fg_color;
-}
-
-/*****************
- * miscellaneous *
- *****************/
-.floating-bar {
-    border-width: 3px;
-    border-style: none;
-    border-radius: 0px;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.floating-bar.top {
-
-}
-
-.floating-bar.right {
-
-}
-
-.floating-bar.bottom {
-
-}
-
-.floating-bar.left {
- 
-}
-
-
-.floating-bar .button,
-.floating-bar .button:focus {
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 0;
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-.view.dim-label,
-.dim-label {
-    color: alpha(currentColor, 0.6);
-}
-
-.dnd {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-}
-
-.grip {
-    background-color: transparent;
-}
-
-.arrow {
-    color: alpha(@theme_fg_color, 0.7);
-}
-.arrow:insensitive {
-    color: alpha(@theme_fg_color, 0.4);
-}
-
-
-
-/******************
- * pane separator *
- ******************/
-.pane-separator {
-    background-color: transparent;
-    color: transparent;
-}
-
-
-/*************
- * statusbar *
- *************/
-GtkStatusbar {
-    padding: 4px;
-    color: @theme_fg_color;
-}
-
-
-/************
- * textview *
- ************/
-GtkTextView {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-/***********
- * tooltip *
- ***********/
-.tooltip {
-    border-width: 0;
-    border-style: none;
-    border-radius: 0px;
-    background-color: @theme_tooltip_bg_color;
-    background-image: none;
-    color: @theme_tooltip_fg_color;
-}
-
-.tooltip * {
-    background-color: transparent;
-}
-
-/************
- * treeview *
- ************/
-GtkTreeView {
-    -GtkTreeView-vertical-separator: 0;
-    -GtkWidget-focus-line-width: 1;
-    -GtkWidget-focus-padding: 1;
-}
-
-GtkTreeView.dnd {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0;
-}
-
-GtkTreeView .entry {
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-/************
- * viewport *
- ************/
-GtkViewport.frame {
-    border-width: 0;
-}
-
-.view {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.view:insensitive,
-.view:insensitive:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-.view:selected,
-.view:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-/*********************
- * app notifications *
- *********************/
-.app-notification {
-    border-style: none;
-    border-width: 0 1px 1px 1px;
-    border-radius: 0;
-    padding: 8px;
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-}
-
-
-/******************************
- * destructive action buttons *
- ******************************/
-.destructive-action.button {
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 0;
-    background-color: @error_color;
-    background-image: none;
-    color: mix(@theme_selected_fg_color, @error_color, 0.1);
-}
-
-.destructive-action.button:hover {
-    border-color: transparent;
-    background-color: shade(@error_color, 1.12);
-    background-image: none;
-}
-
-.destructive-action.button:active {
-    border-color: transparent;
-    background-color: shade(@error_color, 0.87);
-    background-image: none;
-}
-
-.destructive-action.button:hover:active {
-    border-color: transparent;
-}
-
-/**************
- * List boxes *
- **************/
-EggListBox {
-    background-color: @theme_base_color;
-}
-
-EggListBox:hover {
-    background-color: mix(white, @theme_selected_bg_color, 0.05) ;
-}
-
-EggListBox:selected {
-    background-color: @theme_selected_bg_color;
-}
-
-.list {
-    background-color: @theme_base_color;
-}
-
-.list-row:hover {
-    background-color: mix(white, @theme_selected_bg_color, 0.05) ;
-}
-
-.list-row:selected {
-    background-color: @theme_selected_bg_color;
-}
-
-/*************************
- * touch text selections *
- *************************/
-GtkBubbleWindow {
-    border-radius: 0;
-    background-clip: border-box;
-}
-
-GtkBubbleWindow.osd.background {
-    background-color: @theme_fg_color;
-}
-
-GtkBubbleWindow .toolbar {
-    background-color: transparent;
-}
-
--- a/home/system/gtk/theme/gtk-3.0/gtk.css
+++ b/home/system/gtk/theme/gtk-3.0/gtk.css
@@ -1,85 +0,0 @@
-
-/* Default color scheme */
-@import url("../colors3");
-
-/* colormap actually used by the theme, to be overridden in other css files */
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
-/* shadow effects */
-@define-color shadow alpha(@theme_fg_color, 0.1);
-
-/* misc colors used by gtk+ */
-@define-color info_fg_color white;
-@define-color info_bg_color #BACF66;
-@define-color warning_fg_color white;
-@define-color warning_bg_color #E6A682;
-@define-color question_fg_color white;
-@define-color question_bg_color #74C47B;
-@define-color error_fg_color white;
-@define-color error_bg_color #E682C8;
-@define-color link_color mix (@theme_selected_bg_color, black, 0.15);
-@define-color success_color #53a93f;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-
-/* widget colors*/
-@define-color border_color #363D43;
-@define-color button_normal_color #3F474A;
-@define-color button_info_color #72B279;
-@define-color button_default_active_color shade(@theme_selected_bg_color, 0.857);
-@define-color entry_border_color shade(@theme_base_color, 0.9);
-@define-color frame_border_bottom_color #E3E4E7;
-@define-color sel_color #B98CD7;
-@define-color switch_bg_color #C9CBCF;
-@define-color panel_bg_color @bg_color;
-@define-color panel_fg_color @fg_color;
-@define-color borders #FAFAFA;
-@define-color scrollbar_trough shade(@theme_base_color, 0.9);
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-
-
-/* osd */
-@define-color osd_separator #49525B;
-@define-color osd_fg #ABB4BD;
-@define-color osd_bg #434A54;
-
-/* window manager colors */
-@define-color wm_bg @theme_bg_color;
-@define-color wm_title_focused @theme_fg_color;
-@define-color wm_title_unfocused @theme_text_color;
-@define-color wm_border_focused @border_color;
-@define-color wm_border_unfocused @border_color;
-
-@import url("gtk-widgets.css");
-@import url("gtk-widgets-assets.css");
-@import url("unity.css");
-@import url("widgets/button.css");
-@import url("widgets/cell-row.css");
-@import url("widgets/check-radio.css");
-@import url("widgets/column-header.css");
-@import url("widgets/calendar.css");
-@import url("widgets/entry.css");
-@import url("widgets/infobar.css");
-@import url("widgets/menu.css");
-@import url("widgets/notebook.css");
-@import url("widgets/progress-scale.css");
-@import url("widgets/scrollbar.css");
-@import url("widgets/separator.css");
-@import url("widgets/sidebar.css");
-@import url("widgets/spinbutton.css");
-@import url("widgets/spinner.css");
-@import url("widgets/switch.css");
-@import url("widgets/color-chooser.css");
-@import url("widgets/toolbar.css");
-@import url("widgets/header-bar.css");
-@import url("widgets/osd.css");
-@import url("widgets/csd.css");
-@import url("widgets/combobox.css");
-@import url("widgets/selection-mode.css");
--- a/home/system/gtk/theme/gtk-3.0/gtk.css.base
+++ b/home/system/gtk/theme/gtk-3.0/gtk.css.base
@@ -1,92 +0,0 @@
-
-/* Default color scheme */
-@define-color bg_color {color0};
-@define-color fg_color {color15};
-@define-color base_color {color1};
-@define-color text_color {color15};
-@define-color selected_bg_color {active};
-@define-color selected_fg_color {color15};
-@define-color tooltip_bg_color {color0};
-@define-color tooltip_fg_color {color15};
-
-/* colormap actually used by the theme, to be overridden in other css files */
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
-/* shadow effects */
-@define-color shadow alpha(@theme_fg_color, 0.1);
-
-/* misc colors used by gtk+ */
-@define-color info_fg_color white;
-@define-color info_bg_color #BACF66;
-@define-color warning_fg_color white;
-@define-color warning_bg_color #E6A682;
-@define-color question_fg_color white;
-@define-color question_bg_color #74C47B;
-@define-color error_fg_color white;
-@define-color error_bg_color #E682C8;
-@define-color link_color mix (@theme_selected_bg_color, black, 0.15);
-@define-color success_color #53a93f;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-
-/* widget colors*/
-@define-color border_color #363D43;
-@define-color button_normal_color #3F474A;
-@define-color button_info_color #72B279;
-@define-color button_default_active_color shade(@theme_selected_bg_color, 0.857);
-@define-color entry_border_color shade(@theme_base_color, 0.9);
-@define-color frame_border_bottom_color #E3E4E7;
-@define-color sel_color #B98CD7;
-@define-color switch_bg_color #C9CBCF;
-@define-color panel_bg_color @bg_color;
-@define-color panel_fg_color @fg_color;
-@define-color borders #FAFAFA;
-@define-color scrollbar_trough shade(@theme_base_color, 0.9);
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-
-
-/* osd */
-@define-color osd_separator #49525B;
-@define-color osd_fg #ABB4BD;
-@define-color osd_bg #434A54;
-
-/* window manager colors */
-@define-color wm_bg @theme_bg_color;
-@define-color wm_title_focused @theme_fg_color;
-@define-color wm_title_unfocused @theme_text_color;
-@define-color wm_border_focused @border_color;
-@define-color wm_border_unfocused @border_color;
-
-@import url("gtk-widgets.css");
-@import url("gtk-widgets-assets.css");
-@import url("unity.css");
-@import url("widgets/button.css");
-@import url("widgets/cell-row.css");
-@import url("widgets/check-radio.css");
-@import url("widgets/column-header.css");
-@import url("widgets/calendar.css");
-@import url("widgets/entry.css");
-@import url("widgets/infobar.css");
-@import url("widgets/menu.css");
-@import url("widgets/notebook.css");
-@import url("widgets/progress-scale.css");
-@import url("widgets/scrollbar.css");
-@import url("widgets/separator.css");
-@import url("widgets/sidebar.css");
-@import url("widgets/spinbutton.css");
-@import url("widgets/spinner.css");
-@import url("widgets/switch.css");
-@import url("widgets/color-chooser.css");
-@import url("widgets/toolbar.css");
-@import url("widgets/header-bar.css");
-@import url("widgets/osd.css");
-@import url("widgets/csd.css");
-@import url("widgets/combobox.css");
-@import url("widgets/selection-mode.css");
--- a/home/system/gtk/theme/gtk-3.0/settings.ini
+++ b/home/system/gtk/theme/gtk-3.0/settings.ini
@@ -1,7 +0,0 @@
-[Settings]
-gtk-color-scheme = "base_color:#ffffff\nbg_color:#ECEDEE\ntooltip_bg_color:#dddedf\nselected_bg_color:#33CBBF\ntext_color:#78797A\nfg_color:#6A6B6C\ntooltip_fg_color:#595a5b\nselected_fg_color:#ffffff"
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
-gtk-button-images = 0
-gtk-menu-images = 0
-
--- a/home/system/gtk/theme/gtk-3.0/unity.css
+++ b/home/system/gtk/theme/gtk-3.0/unity.css
@@ -1,68 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-    border-width: 0 0 1px 0;
-    border-style: solid;
-    border-color: #363D43;
-    background-color: #363D43;
-    background-image: none;
-    color: #fff;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-    border-width: 0 1px;
-    color: #fff;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-    border-color: @theme_selected_bg_color;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-SheetStyleDialog.unity-force-quit {
-    background-color: @theme_bg_color;
-}
-
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 4px 4px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: none;
-	box-shadow: none;
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: #999999;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/button.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/button.css
@@ -1,76 +0,0 @@
-
-/**********
- * button *
- **********/
-.button {
-    -GtkWidget-focus-padding: 1;
-    -GtkWidget-focus-line-width: 0;
-    padding: 5px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 3px;
-    background-color: shade( @theme_bg_color, 1.58 );
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.button:hover {
-	background-color: shade( @theme_bg_color, 1.35 );
-    color: @theme_fg_color;
-}
-
-.button:active,
-.button:active:hover {
-    color: @theme_fg_color;
-    background-color: shade(@theme_selected_bg_color, 0.93);
-}
-.button:active:hover {
-    color: shade(@theme_fg_color, 0.6);
-    color: @theme_fg_color;
-}
-
-.button:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-.button *:insensitive {
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-.button:active:insensitive {
-
-}
-
-/* default button */
-.button.default,
-.button.default:focus {
-    border-color: transparent;
-    background-color: @theme_selected_bg_color;
-    color: @theme_fg_color;
-}
-
-.button.default:hover {
-    border-color: transparent;
-    background-color: shade(@theme_selected_bg_color, 1.05);
-}
-
-.button.default:active,
-.button.default:hover:active {
-    border-color: transparent;
-    background-color: mix(@button_default_active_color, white, 0.083);
-    color: shade(@theme_selected_fg_color, 0.95);
-}
-
-.button.default *:insensitive {
-    color: shade(@entry_border_color, 0.9);
-}
-GtkLinkButton.button,
-GtkLinkButton.button:focus,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:focus:active,
-GtkLinkButton.button:focus:hover {
-
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/calendar.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/calendar.css
@@ -1,35 +0,0 @@
-/***********
-* calendar *
-************/
-GtkCalendar {
-    padding: 4px;
-}
-
-GtkCalendar:inconsistent {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.3);
-}
-
-GtkCalendar.view,
-GtkCalendar.header {
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    border-width: 0;
-}
-GtkCalendar.button,
-GtkCalendar.button:focus,
-GtkCalendar.button:hover,
-GtkCalendar.button:hover:focus,
-GtkCalendar.button:active:focus,
-GtkCalendar.button:insensitive {
-    color: @theme_fg_color;
-    border-width: 0;
-    background-color: transparent;
-    background-image: none;
-}
-
-.highlight,
-GtkCalendar.highlight {
-    border-width: 0;
-    background-color: @theme_base_color;
-    color: @theme_selected_fg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/cell-row.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/cell-row.css
@@ -1,27 +0,0 @@
-/****************
- * cell and row *
- ****************/
-.cell {
-    border-width: 0;
-    border-radius: 5px;
-}
-
-.cell:selected,
-.cell:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-row:selected,
-row:selected:hover,
-row:selected:focus {
-    border-width: 0;
-    border-style: none;
-    border-radius: 0;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-
-    -GtkWidget-focus-padding: 1;
-    -GtkWidget-focus-line-width: 0;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/check-radio.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/check-radio.css
@@ -1,22 +0,0 @@
-/*******************
- * check and radio *
- *******************/
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-
-}
-
-.check {
-    border-radius: 3px;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus {
-    background-color: transparent;
-}
-
-
--- a/home/system/gtk/theme/gtk-3.0/widgets/color-chooser.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/color-chooser.css
@@ -1,114 +0,0 @@
-/*****************
- * color chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-    border-width: 4px;
-    border-style: solid;
-    border-radius: 0;
-    border-color: @theme_bg_color;
-    background-color: transparent;
-    transition: all 200ms ease-out;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-    border-width: 0;
-    border-radius: 0;
-    border-color: @theme_bg_color;
-    transition: all 200ms ease-in;
-}
-
-GtkColorSwatch.color-dark:hover {
-}
-
-GtkColorSwatch.color-light:hover {
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-    background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-
-}
-
-GtkColorSwatch:only-child {
-
-}
-
-GtkColorSwatch.top {
-
-}
-
-GtkColorSwatch.bottom {
-
-}
-
-GtkColorChooserWidget #add-color-button {
-    transition: all 100ms ease-out;
-    border-color: @entry_border_color;
-    border-width: 1px;
-    border-style: none;
-    border-radius: 0;
-    background-color: @theme_base_color;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-    transition: all 100ms ease-in;
-    border-color: @theme_selected_bg_color;
-    border-width: 1px;
-    border-style: none;
-    border-radius: 0;
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-    border-width: 1px;
-    border-style: solid;
-    border-width: 0;
-    background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-    border-color: alpha(black, 0.3);
-    color: alpha(black, 0.3);
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-    border-color: alpha(white, 0.3);
-    color: alpha(white, 0.3);
-}
-
-GtkColorEditor GtkColorSwatch {
-    border-width: 4px;
-    border-style: solid;
-    border-radius: 0;
-    border-color: @theme_bg_color;
-    background-color: transparent;
-    transition: all 200ms ease-out;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-    border-width: 0;
-    border-radius: 0;
-    border-color: @theme_bg_color;
-    transition: all 200ms ease-in;
-}
-
-GtkColorButton.button {
-    padding: 6px;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/column-header.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/column-header.css
@@ -1,53 +0,0 @@
-/*****************
- * column-header *
- *****************/
-column-header.button,
-column-header.button:active,
-column-header .button,
-column-header .button:active {
-    font-weight: bold;
-    border-width: 0;
-    border-radius: 0;
-}
-column-header.button,
-column-header.button:active,
-column-header.button:focus,
-column-header.button:active:focus,
-column-header .button,
-column-header .button:active,
-column-header .button:focus,
-column-header .button:active:focus {
-
-    box-shadow: none;
-    background-color: inherit;
-    background-image: none;
-}
-column-header.button:hover,
-column-header.button:active:hover,
-column-header.button:hover:focus,
-column-header.button:active:hover:focus,
-column-header .button:hover,
-column-header .button:active:hover,
-column-header .button:hover:focus,
-column-header .button:active:hover:focus {
- 
-    box-shadow: none;
-    background-color: inherit;
-    background-image: none;
-}
-column-header:last-child.button,
-column-header:last-child .button {
-
-}
-column-header.button,
-column-header .button,
-column-header.button:focus,
-column-header .button:focus {
-    color: shade(@theme_text_color, 1.1);
-}
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:focus,
-column-header .button:active:focus {
-    color: @theme_selected_bg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/combobox.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/combobox.css
@@ -1,47 +0,0 @@
-/************
- * combobox * 
- ************/
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry:active,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .entry:active,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .entry:insensitive {
-    border-width: 1px 0 1px 1px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:insensitive {
-    border-width: 1px 1px 1px 1px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-GtkComboBox .button,
-.action-bar GtkComboBox .button {
-    padding: 4px 10px;
-    background-color: shade(@theme_bg_color, 1.55);
-    color: shade(@theme_text_color, 1.10);
-}
-
-GtkComboBox .button:hover,
-GtkComboBox .button:active,
-GtkComboBox .button:checked,
-GtkComboBox .button:active:hover,
-.action-bar GtkComboBox .button:hover,
-.action-bar GtkComboBox .button:active,
-.action-bar GtkComboBox .button:checked,
-.action-bar GtkComboBox .button:active:hover  {
-    background-color: shade(@theme_selected_bg_color, 1);
-    color: shade(@theme_text_color, 1); 
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/csd.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/csd.css
@@ -1,117 +0,0 @@
-/*******
- * CSD *
- *******/
-.titlebar {
-    border-width: 0;
-    border-style: none;
-    border-color: transparent;
-/*    border-image: linear-gradient(to left,
-		shade(@theme_selected_bg_color, 1.20) 25%,
-		shade(@theme_selected_bg_color, 1.05) 25%,
-		shade(@theme_selected_bg_color, 1.05) 50%,
-		shade(@theme_selected_bg_color, 0.90) 50%,
-		shade(@theme_selected_bg_color, 0.90) 75%,
-		shade(@theme_selected_bg_color, 0.75) 75%) 5 0 0 0/ 5px 0 0 0;*/
-    background-image: none;
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-    text-shadow: none;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-    border: none;
-    box-shadow: none;
-}
-
-.titlebar .title {
-    font: bold;
-}
-
-.titlebar:backdrop {
-    background-image: none;
-    background-color: @theme_bg_color;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.4);
-    text-shadow: none;
-}
-
-.titlebar .titlebutton {
-    padding: 4px;
-    border-style: none;
-    background: none;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
-    icon-shadow: none;
-}
-
-.titlebar .titlebutton:hover,
-.titlebar .titlebutton:hover:focus {
-    background: none;
-    color: @theme_selected_bg_color;
-    icon-shadow: none;
-}
-
-.titlebar .titlebutton:active,
-.titlebar .titlebutton:active:hover {
-    background: none;
-    color: shade(@theme_selected_bg_color, 0.9);
-    icon-shadow: none;
-    box-shadow: none;
-}
-
-/*
-.titlebar .right .titlebutton:first-child {
-    border-left: 1px solid shade(@toolbar_bg_color, 0.9);
-}
-
-.titlebar .right .titlebutton:last-child {
-}
-
-.titlebar .left .titlebutton:last-child {
-    border-right: 1px solid shade(@toolbar_bg_color, 0.9);
-}
-
-.titlebar .left .titlebutton:first-child {
-}
-*/
-
-.titlebar .titlebutton:backdrop {
-    background-image: none;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.4);
-    icon-shadow: none;
-}
-
-.window-frame {
-    background-image: none;
-    border-width: 2px;
-    border-style: solid;
-    border-color: @theme_bg_color;
-    border-image: none;
-    border-radius: 0;
-    box-shadow: 0 3px 12px 2px alpha(black, 0.5);
-
-    /* this is used for the resize cursor area */
-    margin: 10px;
-}
-
-.window-frame:backdrop {
-    border-width: 2px;
-    border-color: @theme_bg_color;
-    border-image: none;
-    box-shadow: 0 2px 7px 1px alpha(black, 0.5);
-}
-
-GtkWindow {
-    color: @fg_color;
-    background-color: @bg_color;
-}
-
-GtkPaned {
-    background-color: @bg_color;
-}
-
-GtkEventBox {
-    background-color: @bg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/entry.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/entry.css
@@ -1,38 +0,0 @@
-/*********
- * entry *
- *********/
-.entry {
-    padding: 6px 8px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 0;
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.entry:active,
-.entry:focus {
-    box-shadow: inset 4px 0 @theme_selected_bg_color;
-}
-
-.entry:selected,
-.entry:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-.entry:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-.entry.progressbar {
-    border-width: 0;
-    border-radius: 0;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/header-bar.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/header-bar.css
@@ -1,27 +0,0 @@
-/**************
- * header-bar *
- **************/
-
-.header-bar {
-    padding: 6px;
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-}
-
-.header-bar .button.text-button {
-    padding: 4px;
-}
-
-.header-bar .button.image-button {
-    padding: 6px;
-}
-
-.header-bar .title {
-    font: bold;
-}
-
-.header-bar .subtitle {
-    font: smaller;
-}
-
--- a/home/system/gtk/theme/gtk-3.0/widgets/infobar.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/infobar.css
@@ -1,90 +0,0 @@
-/***********
- * infobar *
- ***********/
-GtkInfoBar {
-    border-width: 0;
-    border-style: none;
-}
-
-.info {
-    border-width: 0;
-    border-style: none;
-    background-color: @info_bg_color;
-    background-image: none;
-    color: @info_fg_color;
-}
-
-.warning {
-    border-width: 0;
-    border-style: none;
-    background-color: @warning_bg_color;
-    background-image: none;
-    color: @warning_fg_color;
-}
-
-.question {
-    border-width: 0;
-    border-style: none;
-    background-color: @question_bg_color;
-    background-image: none;
-    color: @question_fg_color;
-}
-
-.error {
-    border-width: 0;
-    border-style: none;
-    background-color: @error_bg_color;
-    background-image: none;
-    color: @error_fg_color;
-}
-
-.warning .button,
-.question .button,
-.info .button,
-.error .button,
-.warning .button.close,
-.question .button.close,
-.info .button.close,
-.error .button.close {
-
-}
-.warning .button:hover,
-.question .button:hover,
-.info .button:hover,
-.error .button:hover,
-.warning .button.close:hover,
-.question .button.close:hover,
-.info .button.close:hover,
-.error .button.close:hover {
-
-}
-.warning .button:active,
-.question .button:active,
-.info .button:active,
-.error .button:active,
-.warning .button.close:active,
-.question .button.close:active,
-.info .button.close:active,
-.error .button.close:active,
-.warning .button:active:hover,
-.question .button:active:hover,
-.info .button:active:hover,
-.error .button:active:hover,
-.warning .button.close:active:hover,
-.question .button.close:active:hover,
-.info .button.close:active:hover,
-.error .button.close:active:hover {
-
-}
-.warning .button:insensitive,
-.question .button:insensitive,
-.info .button:insensitive,
-.error .button:insensitive {
-
-}
-.warning .button *:insensitive,
-.question .button *:insensitive,
-.info .button *:insensitive,
-.error .button *:insensitive {
-
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/linked-buttons.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/linked-buttons.css
@@ -1,524 +0,0 @@
-/******************
- * linked buttons *
- *****************/
-
-
-
-/* set up shadows for visual separation */
-.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-
-}
-.linked .button:hover,
-.inline-toolbar.toolbar .button:hover,
-.inline-toolbar.toolbar GtkToolButton .button:hover,
-.inline-toolbar.toolbar GtkToolButton > .button:hover {
-    background-color: @theme_base_color;
-    color: shade(@theme_fg_color, 0.7);
-}
-.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-.linked .button:active:hover,
-.inline-toolbar.toolbar .button:active:hover,
-.inline-toolbar.toolbar GtkToolButton .button:active:hover,
-.inline-toolbar.toolbar GtkToolButton > .button:active:hover {
-    background-color: shade(@theme_selected_bg_color, 1.05);
-}
-.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-/* remove box shadow from last-child and only-child */
-
-.linked .entry:last-child,
-.linked .entry:only-child,
-.linked .button:last-child,
-.linked .button:only-child,
-.linked .button:insensitive:last-child,
-.linked .button:insensitive:only-child,
-.linked .button:active *:insensitive:last-child,
-.linked .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar .button:active *:insensitive:last-child,
-.inline-toolbar.toolbar .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive {
-
-}
-
-/* add back the inset shadow effect */
-.linked .button:active:last-child,
-.linked .button:active:only-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active {
-
-}
-
-/* middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
-    border-width: 1px;
-    border-radius: 0;
-    border-color: transparent;
-    border-style: solid;
-}
-
-/*leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive {
-
-}
-
-/* rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive {
-
-}
-
-/* linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:insensitive:only-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child .button,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
- border-width: 1px;
-    border-radius: 0;
-    border-color: transparent;
-    border-style: solid;
-}
-
-/* linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.linked.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-.linked.vertical .button:hover,
-.inline-toolbar.toolbar.vertical .button:hover,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:hover {
-    background-color: @theme_base_color;
-    color: shade(@theme_fg_color, 0.7);
-}
-.linked.vertical .button:active:hover,
-.inline-toolbar.toolbar.vertical .button:active:hover,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active:hover {
-    background-color: shade(@theme_selected_bg_color, 1.05);
-}
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-/* remove box shadow from last-child and only-child */
-.linked.vertical .button:last-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.linked.vertical .button:insensitive:only-child,
-.linked.vertical .button:active *:insensitive:last-child,
-.linked.vertical .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive {
-
-}
-
-/* add back the inset shadow effect */
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active {
-
-}
-
-/* middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:insensitive {
-border-width: 1px;
-    border-radius: 0;
-    border-color: transparent;
-    border-style: solid;
-}
-
-/* top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-
-
-}
-
-/* bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-
-}
-
-/* linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-    border-width: 1px;
-    border-radius: 0;
-    border-color: transparent;
-    border-style: solid;
-}
-
-/* linked toolbar buttons */
-.primary-toolbar .linked .button,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.toolbar .linked .button,
-.header-bar .button.raised.linked,
-.header-bar .raised.linked .button,
-.header-bar .linked .button {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-.primary-toolbar .linked .button:hover,
-.primary-toolbar .button.raised.linked:hover,
-.primary-toolbar .raised.linked .button:hover,
-.toolbar .button.raised.linked:hover,
-.toolbar .raised.linked .button:hover,
-.toolbar .linked .button:hover,
-.header-bar .button.raised.linked:hover,
-.header-bar .raised.linked .button:hover,
-.header-bar .linked .button:hover {
-    background-color: @theme_base_color;
-    color: shade(@theme_fg_color, 0.7);
-}
-.primary-toolbar .linked .button:active,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.toolbar .linked .button:active,
-.header-bar .button.raised.linked:active,
-.header-bar .raised.linked .button:active,
-.header-bar .linked .button:active {
-    background-color: #32383E;
-    color: @theme_fg_color;
-}
-.primary-toolbar .linked .button:active:hover,
-.primary-toolbar .button.raised.linked:active:hover,
-.primary-toolbar .raised.linked .button:active:hover,
-.toolbar .button.raised.linked:active:hover,
-.toolbar .raised.linked .button:active:hover,
-.toolbar .linked .button:active:hover,
-.header-bar .button.raised.linked:active:hover,
-.header-bar .raised.linked .button:active:hover,
-.header-bar .linked .button:active:hover {
-    background-color: shade(#32383E, 1.08);
-}
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.toolbar .linked .button:insensitive,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-/* remove box shadow from last-child and only-child */
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:only-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:only-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.primary-toolbar .linked .button:insensitive:only-child,
-.primary-toolbar .button:insensitive.raised.linked:last-child,
-.primary-toolbar .button:insensitive.raised.linked:only-child,
-.primary-toolbar .linked .button:active *:insensitive:last-child,
-.primary-toolbar .linked .button:active *:insensitive:only-child,
-.primary-toolbar .button:active *:insensitive.raised.linked:last-child,
-.primary-toolbar .button:active *:insensitive.raised.linked:only-child,
-.primary-toolbar .raised.linked .button:last-child,
-.primary-toolbar .raised.linked .button:only-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.primary-toolbar .raised.linked .button:insensitive:only-child,
-.primary-toolbar .raised.linked .button:active *:insensitive:last-child,
-.primary-toolbar .raised.linked .button:active *:insensitive:only-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .button.raised.linked:only-child,
-.toolbar .button:insensitive.raised.linked:last-child,
-.toolbar .button:insensitive.raised.linked:only-child,
-.toolbar .button:active *:insensitive.raised.linked:last-child,
-.toolbar .button:active *:insensitive.raised.linked:only-child,
-.toolbar .raised.linked .button:last-child,
-.toolbar .raised.linked .button:only-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:only-child,
-.toolbar .raised.linked .button:active *:insensitive:last-child,
-.toolbar .raised.linked .button:active *:insensitive:only-child,
-.toolbar .linked .button:last-child,
-.toolbar .linked .button:only-child,
-.toolbar .linked .button:insensitive:last-child,
-.toolbar .linked .button:insensitive:only-child,
-.toolbar .linked .button:active *:insensitive:last-child,
-.toolbar .linked .button:active *:insensitive:only-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .button.raised.linked:only-child,
-.header-bar .button:insensitive.raised.linked:last-child,
-.header-bar .button:insensitive.raised.linked:only-child,
-.header-bar .button:active *:insensitive.raised.linked:last-child,
-.header-bar .button:active *:insensitive.raised.linked:only-child,
-.header-bar .raised.linked .button:last-child,
-.header-bar .raised.linked .button:only-child,
-.header-bar .raised.linked .button:insensitive:last-child,
-.header-bar .raised.linked .button:insensitive:only-child,
-.header-bar .raised.linked .button:active *:insensitive:last-child,
-.header-bar .raised.linked .button:active *:insensitive:only-child,
-.header-bar .linked .button:last-child,
-.header-bar .linked .button:only-child,
-.header-bar .linked .button:insensitive:last-child,
-.header-bar .linked .button:insensitive:only-child,
-.header-bar .linked .button:active *:insensitive:last-child,
-.header-bar .linked .button:active *:insensitive:only-child {
-
-}
-
-/* add back the inset shadow effect */
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .button:active.raised.linked:last-child,
-.primary-toolbar .button:active.raised.linked:only-child,
-.primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:active:only-child,
-.toolbar .button:active.raised.linked:last-child,
-.toolbar .button:active.raised.linked:only-child,
-.toolbar .raised.linked .button:active:last-child,
-.toolbar .raised.linked .button:active:only-child,
-.toolbar .linked .button:active:last-child,
-.toolbar .linked .button:active:only-child,
-.header-bar .button:active.raised.linked:last-child,
-.header-bar .button:active.raised.linked:only-child,
-.header-bar .raised.linked .button:active:last-child,
-.header-bar .raised.linked .button:active:only-child,
-.header-bar .linked .button:active:last-child,
-.header-bar .linked .button:active:only-child {
-
-}
-
-/* middle button */
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button,
-.primary-toolbar .raised.linked .button:active,
-.primary-toolbar .raised.linked .button:insensitive,
-.toolbar .button.raised.linked,
-.toolbar .button.raised.linked:active,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button,
-.toolbar .raised.linked .button:active,
-.toolbar .raised.linked .button:insensitive,
-.toolbar .linked .button,
-.toolbar .linked .button:active,
-.toolbar .linked .button:insensitive,
-.header-bar .button.raised.linked,
-.header-bar .button.raised.linked:active,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button,
-.header-bar .raised.linked .button:active,
-.header-bar .raised.linked .button:insensitive,
-.header-bar .linked .button,
-.header-bar .linked .button:active,
-.header-bar .linked .button:insensitive {
-    border-width: 1px;
-    border-radius: 4px;
-    border-color: transparent;
-    border-style: solid;
-}
-
-/* leftmost button */
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.primary-toolbar .raised.linked .button:active:first-child,
-.primary-toolbar .raised.linked .button:insensitive:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .button.raised.linked:active:first-child,
-.toolbar .button.raised.linked:insensitive:first-child,
-.toolbar .raised.linked .button:first-child,
-.toolbar .raised.linked .button:active:first-child,
-.toolbar .raised.linked .button:insensitive:first-child,
-.toolbar .linked .button:first-child,
-.toolbar .linked .button:active:first-child,
-.toolbar .linked .button:insensitive:first-child,
-.header-bar .button.raised.linked:first-child,
-.header-bar .button.raised.linked:active:first-child,
-.header-bar .button.raised.linked:insensitive:first-child,
-.header-bar .raised.linked .button:first-child,
-.header-bar .raised.linked .button:active:first-child,
-.header-bar .raised.linked .button:insensitive:first-child,
-.header-bar .linked .button:first-child,
-.header-bar .linked .button:active:first-child,
-.header-bar .linked .button:insensitive:first-child {
-
-}
-
-/* rightmost button */
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .button.raised.linked:active:last-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:last-child,
-.toolbar .raised.linked .button:active:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.toolbar .linked .button:last-child,
-.toolbar .linked .button:active:last-child,
-.toolbar .linked .button:insensitive:last-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .button.raised.linked:active:last-child,
-.header-bar .button.raised.linked:insensitive:last-child,
-.header-bar .raised.linked .button:last-child,
-.header-bar .raised.linked .button:active:last-child,
-.header-bar .raised.linked .button:insensitive:last-child,
-.header-bar .linked .button:last-child,
-.header-bar .linked .button:active:last-child,
-.header-bar .linked .button:insensitive:last-child {
-
-}
-
-/* linked single button */
-.primary-toolbar .linked .button:only-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .linked .button:insensitive:only-child,
-.primary-toolbar .button.raised.linked:only-child,
-.primary-toolbar .button.raised.linked:active:only-child,
-.primary-toolbar .button.raised.linked:insensitive:only-child,
-.primary-toolbar .raised.linked .button:only-child,
-.primary-toolbar .raised.linked .button:active:only-child,
-.primary-toolbar .raised.linked .button:insensitive:only-child,
-.toolbar .button.raised.linked:only-child,
-.toolbar .button.raised.linked:active:only-child,
-.toolbar .button.raised.linked:insensitive:only-child,
-.toolbar .raised.linked .button:only-child,
-.toolbar .raised.linked .button:active:only-child,
-.toolbar .raised.linked .button:insensitive:only-child,
-.toolbar .linked .button:only-child,
-.toolbar .linked .button:active:only-child,
-.toolbar .linked .button:insensitive:only-child,
-.header-bar .button.raised.linked:only-child,
-.header-bar .button.raised.linked:active:only-child,
-.header-bar .button.raised.linked:insensitive:only-child,
-.header-bar .raised.linked .button:only-child,
-.header-bar .raised.linked .button:active:only-child,
-.header-bar .raised.linked .button:insensitive:only-child,
-.header-bar .linked .button:only-child,
-.header-bar .linked .button:active:only-child,
-.header-bar .linked .button:insensitive:only-child {
-    border-width: 1px;
-    border-radius: 0;
-    border-color: transparent;
-    border-style: solid;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/menu.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/menu.css
@@ -1,257 +0,0 @@
-/********
- * menu *
- ********/
-GtkTreeMenu.menu,
-GtkComboBox .menu {
-
-}
-GtkMenuToolButton.menu {
-
-}
-
-.primary-toolbar .menu,
-.primary-toolbar .button .menu,
-.toolbar .menu,
-.toolbar .primary-toolbar .menu,
-.header-bar .menu,
-.header-bar .primary-toolbar .menu,
-.menubar .menu,
-.menu {
-    padding: 0;
-    border-radius: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-    color: @theme_text_color;
-}
-.menu {
-
-}
-
-.menu.button:hover,
-.menu.button:active,
-.menu.button:insensitive,
-.menu.button {
-    border-width: 0;
-    border-radius: 0;
-    color: @theme_text_color;
-    background-color: transparent;
-    background-image: none;
-}
-.menu.button:insensitive {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.context-menu {
-    font: initial;
-}
-
-/* ubuntu software center menu */
-#toolbar-popup {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-/***********
- * menubar *
- ***********/
-.menubar {
-    -GtkWidget-window-dragging: true;
-
-    border-style: none;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-/***************
- * menubaritem *
- ***************/
-
-.menubar.menuitem,
-.menubar .menuitem {
-    padding: 3px 6px;
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.menubar.menuitem:hover,
-.menubar .menuitem:hover {
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-    /*box-shadow: inset 3px 0 @theme_selected_bg_color;*/
-}
-
-.menubar .menuitem *:hover {
-    color: @theme_text_color;
-}
-
-/************
- * menuitem *
- ************/
-GtkTreeMenu .menuitem {
-    padding: 0;
-    border-width: 0;
-}
-
-.menuitem,
-.menu .menuitem {
-    padding: 0px;
-    border-width: 0;
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: none;
-    color: @theme_text_color;
-
-    -GtkMenuItem-arrow-scaling: 0.52;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-.menu .menuitem:active,
-.menu .menuitem *:active,
-.menu .menuitem:hover,
-.menu .menuitem *:hover {
-    color: @theme_selected_fg_color;
-}
-
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
-    color: mix(@theme_text_color, @theme_base_color, 0.45);
-}
-
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
-    box-shadow: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-.menuitem.check:active,
-.menuitem.radio:active {
-    border-style: none;
-    background-color: transparent;
-}
-
-.menuitem.arrow {
-    color: alpha(@theme_text_color, 0.6);
-}
-
-.menuitem GtkCalendar:inconsistent {
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-}
-
-.menuitem GtkCalendar.button {
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-.menuitem .entry {
-
-}
-
-.menuitem .entry:active,
-.menuitem .entry:focus {
-
-}
-
-.menuitem .accelerator {
-    color: @theme_text_color;
-}
-
-.menuitem .accelerator:hover {
-    color: @theme_selected_fg_color;
-}
-
-.menuitem .accelerator:insensitive {
-    color: mix(@theme_text_color, @theme_base_color, 0.55);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-    padding-right: 4px;
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.raised:active,
-GtkMenuButton.button:active,
-.primary-toolbar .linked GtkMenuButton.button:active,
-.primary-toolbar GtkMenuButton.button:active.raised.linked,
-.primary-toolbar .raised.linked GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button:active.raised.linked,
-.toolbar .raised.linked GtkMenuButton.button:active,
-.toolbar .linked GtkMenuButton.button:active,
-.header-bar GtkMenuButton.button:active.raised.linked,
-.header-bar .raised.linked GtkMenuButton.button:active,
-.header-bar .linked GtkMenuButton.button:active,
-.linked GtkMenuButton.button:active,
-.toolbar .linked.raised GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.linked.raised:active {
-
-}
-
-GtkMenuButton.button:active,
-.linked GtkMenuButton.button:active,
-.toolbar .linked.raised GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button.linked.raised:active {
-
-}
-.primary-toolbar .linked GtkMenuButton.button:active:last-child,
-.primary-toolbar GtkMenuButton.button:active.raised.linked:last-child,
-.primary-toolbar .raised.linked GtkMenuButton.button:active:last-child,
-.toolbar GtkMenuButton.button:active.raised.linked:last-child,
-.toolbar .raised.linked GtkMenuButton.button:active:last-child,
-.toolbar .linked GtkMenuButton.button:active:last-child,
-.header-bar GtkMenuButton.button:active.raised.linked:last-child,
-.header-bar .raised.linked GtkMenuButton.button:active:last-child,
-.header-bar .linked GtkMenuButton.button:active:last-child,
-.linked GtkMenuButton.button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.button:active:last-child,
-.toolbar GtkMenuButton.button.linked.raised:active:last-child {
-
-}
-.primary-toolbar .linked GtkMenuButton.button:active:first-child,
-.primary-toolbar GtkMenuButton.button:active.raised.linked:first-child,
-.primary-toolbar .raised.linked GtkMenuButton.button:active:first-child,
-.toolbar GtkMenuButton.button:active.raised.linked:first-child,
-.toolbar .raised.linked GtkMenuButton.button:active:first-child,
-.toolbar .linked GtkMenuButton.button:active:first-child,
-.header-bar GtkMenuButton.button:active.raised.linked:first-child,
-.header-bar .raised.linked GtkMenuButton.button:active:first-child,
-.header-bar .linked GtkMenuButton.button:active:first-child,
-.header-bar .linked GtkMenuButton.button:first-child,
-.linked GtkMenuButton.button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.button:active:first-child,
-.toolbar GtkMenuButton.button.linked.raised:active:first-child {
-
-}
-
-.button.menuitem.menubar:active {
- 
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.button:active,
-.toolbar GtkMenuButton.button:active {
-
-}
-
-GtkMenuButton .menu {
-
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/notebook.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/notebook.css
@@ -1,75 +0,0 @@
-/************
- * notebook *
- ************/
-.notebook {
-    padding: 0;
-    border-style: none;
-    background-color: @theme_bg_color;
-    border-radius: 0px;
-    background-image: none;
-    background-clip: border-box;
-    color: @theme_fg_color;
-}
-
-.notebook GtkViewport {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-.notebook tab {
-    padding: 5px;
-    border-style: none;
-    border-radius: 0;
-    background-color: shade(@theme_bg_color, 0.97);
-    background-image: none;
-}
-
-.notebook tab:active {
-    background-color: @theme_base_color;
-    background-image: none;
-}
-
-.notebook tab GtkLabel {
-    color: @theme_fg_color;
-}
-
-.notebook tab.top {
-    border-radius: 3px 3px 0 0;
-}
-
-.notebook tab.top:active {
-    box-shadow: inset 0 3px @theme_selected_bg_color;
-}
-
-.notebook tab.right {
-    border-radius: 0 3px 3px 0;
-}
-
-.notebook tab.right:active {
-    box-shadow: inset -3px 0 @theme_selected_bg_color;
-}
-
-.notebook tab.bottom {
-    border-radius: 0 0 3px 3px;
-}
-
-.notebook tab.bottom:active {
-    box-shadow: inset 0 -3px @theme_selected_bg_color;
-}
-
-.notebook tab.left {
-    border-radius: 3px 0 0 3px;
-}
-
-.notebook tab.left:active {
-    box-shadow: inset 3px 0 @theme_selected_bg_color;
-}
-.notebook tab .button {
-    background-color: transparent;
-    background-image: none;
-    border-style: none;
-    color: @theme_text_color;
-}
-.notebook tab .button:hover {
-    color: shade(@theme_fg_color, 0.9);
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/osd.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/osd.css
@@ -1,210 +0,0 @@
-/*******
- * osd *
- *******/
-
-.background.osd {
-    border-style: none;
-    border-width: 0;
-    color: @theme_fg_color;
-    background-color: @theme_bg_color;
-}
-
-GtkOverlay.osd {
-    border-style: none;
-    border-width: 0;
-    background-color: transparent;
-}
-
-.osd.frame {
-    border-style: none;
-    border-width: 0;
-    background-clip: border-box;
-    background-origin: border-box;
-}
-
-.osd.button,
-.osd .button {
-
-}
-
-.osd.button:prelight,
-.osd.button:hover,
-.osd .button:hover {
-
-}
-
-.osd.button:active,
-.osd .button:active,
-.osd GtkMenuButton.button:active {
-
-}
-
-.osd.button:active:hover,
-.osd .button:active:hover,
-.osd GtkMenuButton.button:active:hover {
-
-}
-
-.osd.button:insensitive,
-.osd .button:insensitive {
-
-}
-
-.osd.button:active *:insensitive,
-.osd .button:active *:insensitive {
-
-}
-
-.osd.toolbar {
-    -GtkToolbar-button-relief: normal;
-
-    padding: 4px;
-    border-width: 0;
-    border-style: none;
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.osd.toolbar .button {
-
-}
-
-.osd.toolbar .button:hover {
-
-}
-
-.osd.toolbar .button:active {
-
-}
-
-.osd.toolbar .button:active:hover {
-
-}
-
-.osd.toolbar .button:focus,
-.osd.toolbar .button:hover:focus,
-.osd.toolbar .button:active:focus,
-.osd.toolbar .button:active:hover:focus {
-
-}
-
-.osd.toolbar .button:insensitive {
-
-}
-
-.osd.toolbar .button:active *:insensitive {
-
-}
-
-.osd.toolbar .button:first-child {
-
-}
-
-.osd.toolbar .button:last-child {
-
-}
-
-.osd.toolbar .button:only-child,
-.osd.toolbar GtkToolButton .button,
-.osd.toolbar GtkToolButton:only-child .button,
-.osd.toolbar GtkToolButton:last-child .button,
-.osd.toolbar GtkToolButton:first-child .button {
-
-}
-
-.osd.toolbar .separator {
-
-}
-
-/* used by gnome-settings-daemon's media-keys OSD */
-.osd.trough {
-
-}
-
-.osd.progressbar {
-
-}
-
-.osd .scale.slider {
-
-}
-
-.osd .scale.slider:hover {
-
-}
-
-.osd .scale.slider:insensitive {
-
-}
-
-.osd .scale.trough {
-
-}
-
-.osd .scale.trough.highlight {
-
-}
-
-.osd .scale.trough:insensitive,
-.osd .scale.trough.highlight:insensitive {
-
-}
-
-.osd GtkProgressBar,
-GtkProgressBar.osd {
-    padding: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 2px;
-    -GtkProgressBar-min-horizontal-bar-height: 2px;
-}
-
-.osd GtkProgressBar.trough,
-GtkProgressBar.osd.trough {
-    padding: 0;
-    border-style: none;
-    border-radius: 0;
-    background-image: none;
-    background-color: transparent;
-}
-
-.osd GtkProgressBar.progressbar,
-GtkProgressBar.osd.progressbar {
-    border-style: none;
-    border-radius: 0;    
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-.osd .view,
-.osd.view {
-
-}
-
-.osd .scrollbar.trough {
-
-}
-
-.osd .scrollbar.slider {
-
-}
-
-.osd .scrollbar.slider:hover {
-
-}
-
-.osd .scrollbar.slider:active {
-
-}
-
-.osd GtkIconView.cell:selected,
-.osd GtkIconView.cell:selected:focus {
-
-}
-
-/* used by Documents */
-.osd .page-thumbnail {
-
-
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/progress-scale.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/progress-scale.css
@@ -1,203 +0,0 @@
-/*************************
- * progressbar and scale *
- *************************/
-GtkProgressBar {
-    padding: 0;
-    border-width: 0;
-    border-radius: 0;
-}
-
-
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-    border-width: 0 0 4px 0;
-    border-style: solid;
-    border-color: @theme_selected_bg_color;
-    background-image: none;
-    border-radius: 0px;
-}
-.progressbar row:selected,
-.progressbar row:selected:focus {
-
-    border-color: shade(@theme_bg_color, 0.5);
-}
-
-.progressbar,
-.progressbar.vertical {
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-
-.trough row,
-.trough row:hover,
-.trough row:selected,
-.trough row:selected:focus {
-    border-width: 0 0 4px 0;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.93);
-    background-image: none;
-    border-radius: 0px;
-}
-.trough row:selected,
-.trough row:selected:focus {
-    border-color: shade(@theme_bg_color, 0.93);
-
-}
-.trough,
-.trough.vertical {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: none;
-}
-
-/* level bars as used for password quality or remaining power */
-GtkLevelBar {
-    -GtkLevelBar-min-block-width: 34;
-    -GtkLevelBar-min-block-height: 3;
-}
-
-GtkLevelBar.vertical {
-    -GtkLevelBar-min-block-width: 3;
-    -GtkLevelBar-min-block-height: 34;
-}
-
-.level-bar.trough {
-    padding: 0;
-    border-radius: 0;
-}
-
-.level-bar.fill-block {
-    border-width: 0;
-    border-style: none;
-    background-color: @theme_selected_bg_color;
-}
-
-.level-bar.indicator-continuous.fill-block {
-    padding: 1px;
-    border-radius: 0;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal {
-    margin: 0 1px;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical {
-    margin: 1px 0;
-}
-
-/* discrete indicator border rounding,
-   uncomment when :nth-child will be working
-   on the widget
-
-.level-bar.indicator-discrete.fill-block.horizontal:first-child {
-    border-radius: 2px 0 0 2px;
-}
-
-.level-bar.indicator-discrete.fill-block.horizontal:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:first-child {
-    border-radius: 2px 2px 0 0;
-}
-
-.level-bar.indicator-discrete.fill-block.vertical:last-child {
-    border-radius: 0 0 2px 2px;
-}
-*/
-
-.level-bar.fill-block.level-high {
-    background-image: linear-gradient(to bottom,
-                                      shade(@success_color, 1.2),
-                                      @success_color 75%,
-                                      shade(@success_color, 0.95)
-                                      );
-}
-
-.level-bar.fill-block.level-low {
-    background-image: linear-gradient(to bottom,
-                                      shade(@warning_color, 1.3),
-                                      @warning_color 75%,
-                                      shade(@warning_color, 0.9)
-                                      );
-}
-
-.level-bar.fill-block.empty-fill-block {
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: none;
-}
-
-.scale {
-    padding: 0;
-    border-width: 0;
-    border-radius: 0;
-
-    -GtkRange-slider-width: 16;
-    -GtkRange-trough-border: 1;
-    -GtkScale-slider-length: 6;
-}
-
-.scale.slider {
-    border-radius: 0;
-    background-color: @button_normal_color;
-    background-image: none;
-
-}
-
-.scale.slider:hover {
-    background-color: shade(@button_normal_color, 1.06);
-}
-
-.scale.slider:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-      background-size: 50%;
-      background-repeat: no-repeat;
-      background-position: center;
-}
-
-.scale.mark {
-    color: shade(@theme_bg_color, 0.85);
-}
-
-.scale.trough {
-    margin: 7px 0;
-    border-radius: 0;
-    background-color: shade(@theme_bg_color, 0.93);
-    background-image: none;
-}
-
-.scale.trough.vertical {
-    margin: 0 7px;
-}
-
-.menuitem .scale.highlight.left,
-.scale.highlight.left {
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-.menuitem .scale.highlight.left:hover {
-    background-color: shade(@theme_selected_bg_color, 1.1);
-}
-
-.scale.highlight.bottom {
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-.scale.trough:insensitive,
-.scale.highlight.left:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/scrollbar.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/scrollbar.css
@@ -1,75 +0,0 @@
-/*************
- * scrollbar *
- *************/
-.scrollbar {
-    border-width: 0;
-    border-style: none;
-    padding: 0;
-    border-radius: 3px;
-}
-
-.scrollbars-junction,
-.scrollbar.trough {
-    border-width: 0;
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-
-    border-width: 0;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: none;
-    color: shade(@theme_bg_color, 0.6);
-}
-
-.scrollbar.slider {
-    border-width: 0;
-    border-radius: 10px;
-    background-color: shade(@button_normal_color, 1.1);
-}
-
-.scrollbar.slider:hover,
-.scrollbar.slider.vertical:hover {
-    background-color: @button_normal_color;
-}
-
-.scrollbar.slider:active,
-.scrollbar.slider.vertical:active {
-    background-color: @theme_selected_bg_color;
-}
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-    border-width: 0;
-    border-radius: 0;
-    background-color: transparent;
-}
-.scrollbar.slider.fine-tune:prelight:active {
-      background-size: 50%;
-      background-repeat: no-repeat;
-      background-position: center;
-}
-
-/* overlay scrollbar */
-OsThumb {
-    color: shade(@theme_bg_color, 0.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-    background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-    background-color: @theme_selected_bg_color;
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-    background-color: shade(@theme_bg_color, 0.9);
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/selection-mode.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/selection-mode.css
@@ -1,109 +0,0 @@
-/******************
- * selection mode *
- ******************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-    padding: 4px;
-    border-width: 0;
-    border-style: none;
-    background-color: @sel_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.selection-mode.header-bar {
-
-}
-
-.selection-mode.toolbar {
-    padding: 4px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active {
-
-}
-
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active {
-
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-    padding: 6px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    background-color: @button_info_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-    border-color: transparent;
-    background-color: shade(@button_info_color, 1.06);
-    background-image: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active {
-    border-color: transparent;
-    background-color: shade(@button_info_color, 0.925);
-    background-image: none;
-    color: shade(@theme_selected_fg_color, 0.95);
-}
-
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active {
-    border-color: transparent;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-    color: shade(@theme_selected_fg_color, 0.7);
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-    color: @theme_selected_fg_color;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active {
-    color: shade(@theme_selected_fg_color, 0.8);
-    box-shadow: none;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/separator.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/separator.css
@@ -1,24 +0,0 @@
-/*************
- * separator *
- *************/
-.sidebar.view.separator,
-.view.separator,
-.separator {
-    border-width: 0;
-    border-style: none;
-    color: transparent;
-}
-.separator:insensitive {
-     color: transparent;
-}
-.button .separator,
-.button.separator {
-    border-width: 0;
-    color: transparent;
-}
-
-.button .separator:insensitive,
-.button.separator:insensitive {
-    color: transparent;
-    border-width: 0;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/sidebar.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/sidebar.css
@@ -1,47 +0,0 @@
-/***********
- * sidebar *
- ***********/
-.sidebar,
-.sidebar.view,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 0;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.sidebar row:selected,
-.sidebar row:selected:hover,
-.sidebar row:selected:focus,
-.sidebar .view row:selected,
-.sidebar .view row:selected:hover,
-.sidebar .view row:selected:focus {
-    border-width: 0;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.sidebar row:prelight,
-.sidebar .view row:prelight {
-    color: shade(@theme_text_color, 0.8);
-}
-
-.sidebar row:selected:prelight,
-.sidebar .view row:selected:prelight {
-    background-color: shade(@theme_selected_bg_color, 1.05);
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.sidebar .frame {
-    border-width: 0;
-}
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
--- a/home/system/gtk/theme/gtk-3.0/widgets/spinbutton.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/spinbutton.css
@@ -1,102 +0,0 @@
-/**************
- * spinbutton *
- **************/
-.spinbutton .button {
-
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-    padding: 2px 4px;
-    border-width: 0;
-    border-radius: 0;
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-.spinbutton .button:insensitive {
-    color: mix(@theme_text_color, @theme_base_color, 0.55);
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-    color: @theme_fg_color;
-}
-
-.spinbutton .button:first-child {
-    border-radius: 0;
-    box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-    border-radius: 0;
-}
-
-.spinbutton .button:dir(rtl) {
-
-}
-
-.spinbutton.vertical .button {
-
-    border-width: 1px;
-    border-style: none;
-    border-radius: 0;
-    background-color: @theme_base_color;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-    background-image: none;
-    box-shadow: none;
-}
-
-.spinbutton.vertical .button:hover {
-    color: @theme_fg_color;
-    background-image: none;
-}
-
-.spinbutton.vertical .button:active {
-    color: @theme_fg_color;
-    background-image: none;
-}
-
-.spinbutton.vertical .button:active:hover {
-
-}
-
-.spinbutton.vertical .button:focus,
-.spinbutton.vertical .button:hover:focus,
-.spinbutton.vertical .button:active:focus,
-.spinbutton.vertical .button:active:hover:focus {
-
-}
-
-.spinbutton.vertical .button:insensitive {
-    background-color: shade(@theme_bg_color, 1.04);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-    background-image: none;
-}
-
-.spinbutton.vertical .button:first-child {
-    border-width: 1px 1px 0 1px;
-    border-bottom-width: 0;
-    border-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-    border-width: 0 1px 1px 1px;
-    border-top-width: 0;
-    border-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-    border-width: 0;
-    border-style: none;
-    border-top-color: @theme_base_color;
-    border-bottom-color: @theme_base_color;
-    border-radius: 0;
-}
-.spinbutton.vertical.entry:insensitive {
-    border-top-color:  shade(@theme_bg_color, 1.04);
-    border-bottom-color: shade(@theme_bg_color, 1.04);
-}
-.spinbutton.vertical.entry:active,
-.spinbutton.vertical.entry:focus {
-    box-shadow: inset 4px 0 @theme_selected_bg_color;
-}
--- a/home/system/gtk/theme/gtk-3.0/widgets/spinner.css
+++ b/home/system/gtk/theme/gtk-3.0/widgets/spinner.css
@@ -1,120 +0,0 @@
-
-/***********
- * spinner *
- ***********/
-@keyframes spinner {
-    0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-
-    12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
-
-    25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
-
-    37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
-
-    50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
-
-    62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
-
-    75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
-
-    87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
-
-    100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
-}
-
-.spinner {
-    background-color: transparent;
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
-    background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
-    background-size: 15% 15%;
-    background-repeat: no-repeat;
-}
-
-.spinner:active {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
-                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-
-    animation: spinner 1s infinite linear;
-}
-
-.menu.spinner,
-.primary-toolbar .spinner {
-    color: @theme_selected_bg_color;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hadi	60fe3769e8	Release v2.4.0 Former-commit-id: `7ddff66f00`	2024-09-04 10:11:28 +02:00
Hadi	641bf821d4	Update Former-commit-id: `e1f973cabf`	2024-09-04 10:10:52 +02:00
Hadi	25aa619445	Update Former-commit-id: `e38895c4a5`	2024-09-04 10:10:32 +02:00
Hadi	5a0d476de3	Update Former-commit-id: `c2e6fd7d32`	2024-09-04 09:34:42 +02:00
Hadi	00db8d0ae6	Update Former-commit-id: `3d8bcaeeb2`	2024-09-04 02:02:57 +02:00
Hadi	ef66b6f848	Add wofi clipman Former-commit-id: `4135134261`	2024-09-04 01:53:36 +02:00
Hadi	59caed5e69	Add wofi emoji Former-commit-id: `027ef1c398`	2024-09-04 01:44:37 +02:00
Hadi	dad0865d06	Change to gammastep Former-commit-id: `659509e613`	2024-09-04 01:40:24 +02:00
Hadi	c106c76cbc	Update Former-commit-id: `e9a20f49e2`	2024-09-02 18:30:30 +02:00
Hadi	4181544de8	Update Former-commit-id: `75562adea8`	2024-09-02 09:29:50 +02:00
Hadi	30c8414749	Update Former-commit-id: `4afca71b91`	2024-08-30 17:29:30 +02:00
Hadi	6bb9386773	Update Former-commit-id: `4a8f1be75f`	2024-08-30 17:02:38 +02:00
Hadi	ae82cbcf67	Update Former-commit-id: `4540b40dc4`	2024-08-30 16:13:57 +02:00
Hadi	518ac107c6	Update Former-commit-id: `fcd5eca04f`	2024-08-30 16:06:22 +02:00
Hadi	58f5f421e8	Update Former-commit-id: `da1b88305d`	2024-08-30 15:47:17 +02:00
Hadi	999950afc9	Update Former-commit-id: `f0e9294982`	2024-08-30 14:16:30 +02:00
Hadi	13a6249227	Update Former-commit-id: `b3f20e6aef`	2024-08-30 09:33:57 +02:00
Hadi	c68df370cc	Update Former-commit-id: `48a59c4c55`	2024-08-29 22:46:04 +02:00
Hadi	c08d551932	Update Former-commit-id: `c83e5b2213`	2024-08-29 17:04:05 +02:00
Hadi	fa63cf950a	Update Former-commit-id: `55a5c52c51`	2024-08-29 14:29:05 +02:00
Hadi	31cb1fd0f2	Release v2.3.0 Former-commit-id: `90e8d5577e`	2024-08-28 12:30:52 +02:00
Hadi	647236f7b0	Fetch the gtk flatcolor theme folder from github Former-commit-id: `835a9e9da2`	2024-08-28 12:30:04 +02:00
Hadi	43566fc4ae	Update Former-commit-id: `3c171c33be`	2024-08-28 11:43:03 +02:00
Hadi	682c50793c	Update Former-commit-id: `aa8fca0bed`	2024-08-26 17:48:05 +02:00
Hadi	2958b5a03c	Update Former-commit-id: `1255919f41`	2024-08-24 17:09:12 +02:00
Hadi	2b25d18bd5	update Former-commit-id: `109f31151d`	2024-08-23 11:42:33 +02:00
Hadi	248f9a5ba8	update Former-commit-id: `3c3acd03b4`	2024-08-23 11:28:15 +02:00
Hadi	89ff802e16	update Former-commit-id: `65c95ac82a`	2024-08-23 11:28:07 +02:00
Hadi	13643dc1bc	update Former-commit-id: `776095c817`	2024-08-23 11:25:23 +02:00
Hadi	188ef240ae	update Former-commit-id: `d36952e040`	2024-08-23 11:23:16 +02:00
Hadi	a8c1b6363d	update Former-commit-id: `ae0480cab3`	2024-08-23 10:59:21 +02:00
Hadi	8aaa6199f2	update Former-commit-id: `bd8e69fe44`	2024-08-23 10:58:07 +02:00
Hadi	4cd544d59f	update Former-commit-id: `ddeaf0170d`	2024-08-23 10:56:42 +02:00
Hadi	c9a4f2115d	update Former-commit-id: `f27b66f878`	2024-08-23 10:52:35 +02:00
Hadi	395efb8ef1	update Former-commit-id: `574b0043ac`	2024-08-23 10:52:11 +02:00
Hadi	1280370a0a	update Former-commit-id: `fbd804939f`	2024-08-23 10:51:31 +02:00
Hadi	f9bcfb5b50	update Former-commit-id: `cfa4e187c5`	2024-08-23 10:31:25 +02:00
Hadi	3244b2d7e0	update Former-commit-id: `b1d3094bcc`	2024-08-23 10:25:43 +02:00
Hadi	eff0846c0f	update Former-commit-id: `1f7ca17d94`	2024-08-23 10:12:00 +02:00
Hadi	e2a10d4067	update Former-commit-id: `d939bc6f53`	2024-08-23 10:11:07 +02:00
Hadi	39a1d16701	update Former-commit-id: `3419421098`	2024-08-23 10:09:02 +02:00
Hadi	adbe7f3295	Update Former-commit-id: `d816099985`	2024-08-22 21:02:14 +02:00
Hadi	d67f234b2b	update Former-commit-id: `28424b82ab`	2024-08-22 16:28:08 +02:00
Hadi	14a3a77c9e	update Former-commit-id: `771dceeb06`	2024-08-22 16:11:48 +02:00
Hadi	0a1f505dd1	update Former-commit-id: `a2d4d36289`	2024-08-22 16:07:39 +02:00
Hadi	c6b1af26ce	update Former-commit-id: `e4fce0a17a`	2024-08-22 16:06:44 +02:00
Hadi	4a42f1fc91	update Former-commit-id: `88a8168ce2`	2024-08-22 16:02:10 +02:00
Hadi	612a8f6d33	update Former-commit-id: `58d809d860`	2024-08-22 15:41:28 +02:00
Hadi	e7b608ecc4	update Former-commit-id: `4b3f43e402`	2024-08-22 15:32:46 +02:00
Hadi	bfe270b6e1	update Former-commit-id: `bbe0574051`	2024-08-22 15:28:47 +02:00
Hadi	e5f82cdb2d	Update Former-commit-id: `3ef71b9fa2`	2024-08-22 15:25:32 +02:00
Hadi	d705c8cecc	Update Former-commit-id: `a240a76a8e`	2024-08-20 15:27:18 +02:00
Hadi	f2613218db	Update Former-commit-id: `d254085e29`	2024-08-20 00:17:10 +02:00
Hadi	2099c4636c	Update Former-commit-id: `ac2223ad24`	2024-08-19 22:50:30 +02:00
Hadi	8cf93bfbc8	Update Former-commit-id: `8092a2d348`	2024-08-19 22:28:49 +02:00
Hadi	b2dca45c34	Update Former-commit-id: `c434816d83`	2024-08-19 22:20:59 +02:00
Hadi	403e4e1967	Update Former-commit-id: `9e8637e9a8`	2024-08-19 21:09:21 +02:00
Hadi	7ef771f14e	Update Former-commit-id: `d1896b626b`	2024-08-19 20:40:29 +02:00
Hadi	acb7db87df	Release v2.2.0 Former-commit-id: `e6f66110f0`	2024-08-19 20:32:10 +02:00
Hadi	0f5b7f60b6	Update Former-commit-id: `caaa500232`	2024-08-19 19:42:20 +02:00
Hadi	d7264b0de1	Update Former-commit-id: `e27d43df71`	2024-08-19 19:41:24 +02:00
Hadi	23b518381a	Update Former-commit-id: `79a69d245c`	2024-08-19 19:36:21 +02:00
Hadi	8876aae16c	Update Former-commit-id: `849eb5dd11`	2024-08-19 00:38:27 +02:00
Hadi	0ed5d1cf04	Update Former-commit-id: `31ac58592e`	2024-08-19 00:15:43 +02:00
Hadi	83decac5e9	Update Former-commit-id: `b9fda769bc`	2024-08-18 23:57:00 +02:00
Hadi	9104494893	Update Former-commit-id: `94c88e04f2`	2024-08-18 23:56:48 +02:00
Hadi	10d1a73eeb	Update Former-commit-id: `9d74ac9d82`	2024-08-18 23:52:21 +02:00
Hadi	307c0b5edd	Update Former-commit-id: `a64c79ae22`	2024-08-18 23:43:17 +02:00