diff --git a/Installer/color-build.sh b/Installer/color-build.sh
index 83e8056..0d03ecc 100755
--- a/Installer/color-build.sh
+++ b/Installer/color-build.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# from github.com/skinatro/theme-tool/
+# From github.com/skinatro/theme-tool/
 
 ####################
 #Help and Arguments#
@@ -34,8 +34,6 @@ fi
 #Script begin#
 ##############
 
-#extract file extension
-FILE_EXT="${SOURCE##*.}"
 #function defined to build the file
 build(){
 #combine everything to get the output path
@@ -47,16 +45,16 @@ SCRIPT="Installer/Pallets/${PALETTE}.sed"
 }
 
 #no arrays due to posix compliancy
-if [ $FLAVOURNAME = "Mocha" ]; then
+if [ "$FLAVOURNAME" = "Mocha" ]; then
    PALETTE=Mocha
    build
-elif [ $FLAVOURNAME = "Macchiato" ]; then
+elif [ "$FLAVOURNAME" = "Macchiato" ]; then
    PALETTE=Macchiato
    build
-elif [ $FLAVOURNAME = "Frappe" ]; then
+elif [ "$FLAVOURNAME" = "Frappe" ]; then
    PALETTE=Frappe
    build
-elif [ $FLAVOURNAME = "Latte" ]; then
+elif [ "$FLAVOURNAME" = "Latte" ]; then
    PALETTE=Latte
    build
 else clear && echo "Invalid pallet $FLAVOURNAME" && exit
diff --git a/README.md b/README.md
index 2cdf0c6..603677f 100644
--- a/README.md
+++ b/README.md
@@ -37,14 +37,24 @@
 
 ## Installation
 
+### For KDE Plasma Desktop:
 1. `git clone https://github.com/catppuccin/kde catppuccin-kde && cd catppuccin-kde`
 2. Run the install script using `./install.sh` and follow the instructions.
 
-### Notes
-To get a modern, more consistent look, install the [Lightly application style](https://github.com/Luwx/Lightly) and select it from System Settings > Appearance >  Application Style > Lightly.
+### For Krita:
+1. Download the colour-scheme zip file for your preffered flavour from the [release](https://github.com/catppuccin/kde/releases/) tab.
+2. Extract the file and move the theme(s) you wish to install into the following folders for your platform:
+   Windows: `%appdata%\krita\color-schemes`  
+   Linux: `~/.local/share/krita/color-schemes`
+3. Open Krita, and you can choose the theme from Settings > Themes.
+
+
+## Notes
+1. To get a modern, more consistent look, install the [Lightly application style](https://github.com/Luwx/Lightly) and select it from System Settings > Appearance >  Application Style > Lightly.
+2. If you encounter an error similar to 'connection refused' while running the installation script, it may be due to store.kde.org being down or issues with your internet connection.
 
 ## Licensing
-The theme makes modifications to [doncsugar's](https://github.com/doncsugar) [lightly plasma style](https://github.com/doncsugar/lightly-plasma). It is licensed under GPL 3.0 and as such, all the changes to the plasma theme are also licensed under GPL. The MIT License still applies to the color scheme and the window decorations theme.
+The theme makes modifications to [doncsugar's](https://github.com/doncsugar) [lightly plasma style](https://github.com/doncsugar/lightly-plasma). It is licensed under GPL 3.0 and as such, all the changes to the plasma theme are also licensed under GPL. The MIT License still applies to the color scheme, splash screen and the window decorations theme.
 
 
 ## 💝 Thanks to
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/alldesktops.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/alldesktops.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/close.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/close.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/close.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/decoration.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/decoration.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/decoration.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/keepabove.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/keepabove.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/keepbelow.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/keepbelow.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/maximize.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/maximize.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/maximize.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinFrappe-Classic/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/metadata.desktop
rename to Resources/Aurorae/CatppuccinFrappe-Classic/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/minimize.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/minimize.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/minimize.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/restore.svg b/Resources/Aurorae/CatppuccinFrappe-Classic/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Classic/restore.svg
rename to Resources/Aurorae/CatppuccinFrappe-Classic/restore.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/alldesktops.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/alldesktops.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/close.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/close.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/close.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/decoration.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/decoration.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/decoration.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/keepabove.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/keepabove.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/keepbelow.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/keepbelow.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/maximize.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/maximize.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/maximize.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinFrappe-Modern/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/metadata.desktop
rename to Resources/Aurorae/CatppuccinFrappe-Modern/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/minimize.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/minimize.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/minimize.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/restore.svg b/Resources/Aurorae/CatppuccinFrappe-Modern/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinFrappe-Modern/restore.svg
rename to Resources/Aurorae/CatppuccinFrappe-Modern/restore.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/alldesktops.svg b/Resources/Aurorae/CatppuccinLatte-Classic/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/alldesktops.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/close.svg b/Resources/Aurorae/CatppuccinLatte-Classic/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/close.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/close.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/decoration.svg b/Resources/Aurorae/CatppuccinLatte-Classic/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/decoration.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/decoration.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/keepabove.svg b/Resources/Aurorae/CatppuccinLatte-Classic/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/keepabove.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/keepbelow.svg b/Resources/Aurorae/CatppuccinLatte-Classic/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/keepbelow.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/maximize.svg b/Resources/Aurorae/CatppuccinLatte-Classic/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/maximize.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/maximize.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinLatte-Classic/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/metadata.desktop
rename to Resources/Aurorae/CatppuccinLatte-Classic/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/minimize.svg b/Resources/Aurorae/CatppuccinLatte-Classic/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/minimize.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/minimize.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/restore.svg b/Resources/Aurorae/CatppuccinLatte-Classic/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/restore.svg
rename to Resources/Aurorae/CatppuccinLatte-Classic/restore.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/alldesktops.svg b/Resources/Aurorae/CatppuccinLatte-Modern/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/alldesktops.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/close.svg b/Resources/Aurorae/CatppuccinLatte-Modern/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/close.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/close.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/decoration.svg b/Resources/Aurorae/CatppuccinLatte-Modern/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/decoration.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/decoration.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/keepabove.svg b/Resources/Aurorae/CatppuccinLatte-Modern/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/keepabove.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/keepbelow.svg b/Resources/Aurorae/CatppuccinLatte-Modern/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/keepbelow.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/maximize.svg b/Resources/Aurorae/CatppuccinLatte-Modern/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/maximize.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/maximize.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinLatte-Modern/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/metadata.desktop
rename to Resources/Aurorae/CatppuccinLatte-Modern/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/minimize.svg b/Resources/Aurorae/CatppuccinLatte-Modern/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/minimize.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/minimize.svg
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/restore.svg b/Resources/Aurorae/CatppuccinLatte-Modern/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Modern/restore.svg
rename to Resources/Aurorae/CatppuccinLatte-Modern/restore.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/alldesktops.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/alldesktops.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/close.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/close.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/close.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/decoration.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/decoration.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/decoration.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/keepabove.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/keepabove.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/keepbelow.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/keepbelow.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/maximize.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/maximize.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/maximize.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/metadata.desktop
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/minimize.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/minimize.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/minimize.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/restore.svg b/Resources/Aurorae/CatppuccinMacchiato-Classic/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Classic/restore.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Classic/restore.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/alldesktops.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/alldesktops.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/close.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/close.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/close.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/decoration.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/decoration.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/decoration.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/keepabove.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/keepabove.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/keepbelow.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/keepbelow.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/maximize.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/maximize.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/maximize.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/metadata.desktop
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/minimize.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/minimize.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/minimize.svg
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/restore.svg b/Resources/Aurorae/CatppuccinMacchiato-Modern/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMacchiato-Modern/restore.svg
rename to Resources/Aurorae/CatppuccinMacchiato-Modern/restore.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/alldesktops.svg b/Resources/Aurorae/CatppuccinMocha-Classic/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/alldesktops.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/close.svg b/Resources/Aurorae/CatppuccinMocha-Classic/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/close.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/close.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/decoration.svg b/Resources/Aurorae/CatppuccinMocha-Classic/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/decoration.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/decoration.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/keepabove.svg b/Resources/Aurorae/CatppuccinMocha-Classic/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/keepabove.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/keepbelow.svg b/Resources/Aurorae/CatppuccinMocha-Classic/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/keepbelow.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/maximize.svg b/Resources/Aurorae/CatppuccinMocha-Classic/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/maximize.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/maximize.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/metadata.desktop b/Resources/Aurorae/CatppuccinMocha-Classic/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/metadata.desktop
rename to Resources/Aurorae/CatppuccinMocha-Classic/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/minimize.svg b/Resources/Aurorae/CatppuccinMocha-Classic/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/minimize.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/minimize.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/restore.svg b/Resources/Aurorae/CatppuccinMocha-Classic/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/restore.svg
rename to Resources/Aurorae/CatppuccinMocha-Classic/restore.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/alldesktops.svg b/Resources/Aurorae/CatppuccinMocha-Modern/alldesktops.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/alldesktops.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/alldesktops.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/close.svg b/Resources/Aurorae/CatppuccinMocha-Modern/close.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/close.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/close.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/decoration.svg b/Resources/Aurorae/CatppuccinMocha-Modern/decoration.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/decoration.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/decoration.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/keepabove.svg b/Resources/Aurorae/CatppuccinMocha-Modern/keepabove.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/keepabove.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/keepabove.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/keepbelow.svg b/Resources/Aurorae/CatppuccinMocha-Modern/keepbelow.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/keepbelow.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/keepbelow.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/maximize.svg b/Resources/Aurorae/CatppuccinMocha-Modern/maximize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/maximize.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/maximize.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/metadata.desktop b/Resources/Aurorae/CatppuccinMocha-Modern/metadata.desktop
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/metadata.desktop
rename to Resources/Aurorae/CatppuccinMocha-Modern/metadata.desktop
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/minimize.svg b/Resources/Aurorae/CatppuccinMocha-Modern/minimize.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/minimize.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/minimize.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/restore.svg b/Resources/Aurorae/CatppuccinMocha-Modern/restore.svg
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Modern/restore.svg
rename to Resources/Aurorae/CatppuccinMocha-Modern/restore.svg
diff --git a/Resources/aurorae/CatppuccinMocha-Classic/CatppuccinMocha-Classicrc b/Resources/Aurorae/Common/Catppuccin-Classicrc
similarity index 100%
rename from Resources/aurorae/CatppuccinMocha-Classic/CatppuccinMocha-Classicrc
rename to Resources/Aurorae/Common/Catppuccin-Classicrc
diff --git a/Resources/aurorae/CatppuccinMocha-Modern/CatppuccinMocha-Modernrc b/Resources/Aurorae/Common/Catppuccin-Modernrc
similarity index 92%
rename from Resources/aurorae/CatppuccinMocha-Modern/CatppuccinMocha-Modernrc
rename to Resources/Aurorae/Common/Catppuccin-Modernrc
index 6dc2685..8253402 100755
--- a/Resources/aurorae/CatppuccinMocha-Modern/CatppuccinMocha-Modernrc
+++ b/Resources/Aurorae/Common/Catppuccin-Modernrc
@@ -11,8 +11,8 @@ BorderLeft=0
 BorderRight=0
 BorderBottom=0
 
-ButtonHeight=46
-ButtonWidth=46
+ButtonHeight=37
+ButtonWidth=37
 
 ButtonMarginTop=0
 ButtonMarginLeft=0
@@ -38,4 +38,4 @@ TitleEdgeBottom=0
 TitleEdgeLeft=0
 TitleEdgeRight=0
 TitleEdgeTop=0
-TitleHeight=37
+TitleHeight=26
diff --git a/Resources/aurorae/CatppuccinLatte-Classic/CatppuccinLatte-Classicrc b/Resources/Aurorae/Common/CatppuccinLatte-Classicrc
similarity index 100%
rename from Resources/aurorae/CatppuccinLatte-Classic/CatppuccinLatte-Classicrc
rename to Resources/Aurorae/Common/CatppuccinLatte-Classicrc
diff --git a/Resources/aurorae/CatppuccinLatte-Modern/CatppuccinLatte-Modernrc b/Resources/Aurorae/Common/CatppuccinLatte-Modernrc
similarity index 92%
rename from Resources/aurorae/CatppuccinLatte-Modern/CatppuccinLatte-Modernrc
rename to Resources/Aurorae/Common/CatppuccinLatte-Modernrc
index ea958d8..cbc7ec4 100755
--- a/Resources/aurorae/CatppuccinLatte-Modern/CatppuccinLatte-Modernrc
+++ b/Resources/Aurorae/Common/CatppuccinLatte-Modernrc
@@ -11,8 +11,8 @@ BorderLeft=0
 BorderRight=0
 BorderBottom=0
 
-ButtonHeight=46
-ButtonWidth=46
+ButtonHeight=37
+ButtonWidth=37
 
 ButtonMarginTop=0
 ButtonMarginLeft=0
@@ -38,4 +38,4 @@ TitleEdgeBottom=0
 TitleEdgeLeft=0
 TitleEdgeRight=0
 TitleEdgeTop=0
-TitleHeight=37
+TitleHeight=26
diff --git a/Resources/base.colors b/Resources/Base.colors
similarity index 100%
rename from Resources/base.colors
rename to Resources/Base.colors
diff --git a/Resources/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg b/Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg
similarity index 100%
rename from Resources/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg
rename to Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/Catppuccin-Frappe-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/preview.png
similarity index 100%
rename from Resources/Catppuccin-Frappe-Global/contents/previews/preview.png
rename to Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/preview.png
diff --git a/Resources/Catppuccin-Frappe-Global/contents/previews/splash.png b/Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/splash.png
similarity index 100%
rename from Resources/Catppuccin-Frappe-Global/contents/previews/splash.png
rename to Resources/LookAndFeel/Catppuccin-Frappe-Global/contents/previews/splash.png
diff --git a/Resources/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg b/Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg
similarity index 100%
rename from Resources/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg
rename to Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/Catppuccin-Latte-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/preview.png
similarity index 100%
rename from Resources/Catppuccin-Latte-Global/contents/previews/preview.png
rename to Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/preview.png
diff --git a/Resources/Catppuccin-Latte-Global/contents/previews/splash.png b/Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/splash.png
similarity index 100%
rename from Resources/Catppuccin-Latte-Global/contents/previews/splash.png
rename to Resources/LookAndFeel/Catppuccin-Latte-Global/contents/previews/splash.png
diff --git a/Resources/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg b/Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg
similarity index 100%
rename from Resources/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg
rename to Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/fullscreenpreview.jpg
diff --git a/Resources/Catppuccin-Macchiato-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/preview.png
similarity index 100%
rename from Resources/Catppuccin-Macchiato-Global/contents/previews/preview.png
rename to Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/preview.png
diff --git a/Resources/Catppuccin-Macchiato-Global/contents/previews/splash.png b/Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/splash.png
similarity index 100%
rename from Resources/Catppuccin-Macchiato-Global/contents/previews/splash.png
rename to Resources/LookAndFeel/Catppuccin-Macchiato-Global/contents/previews/splash.png
diff --git a/Resources/Catppuccin-Mocha-Global/contents/previews/fullcreenpreview.jpg b/Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/fullcreenpreview.jpg
similarity index 100%
rename from Resources/Catppuccin-Mocha-Global/contents/previews/fullcreenpreview.jpg
rename to Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/fullcreenpreview.jpg
diff --git a/Resources/Catppuccin-Mocha-Global/contents/previews/preview.png b/Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/preview.png
similarity index 100%
rename from Resources/Catppuccin-Mocha-Global/contents/previews/preview.png
rename to Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/preview.png
diff --git a/Resources/Catppuccin-Mocha-Global/contents/previews/splash.png b/Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/splash.png
similarity index 100%
rename from Resources/Catppuccin-Mocha-Global/contents/previews/splash.png
rename to Resources/LookAndFeel/Catppuccin-Mocha-Global/contents/previews/splash.png
diff --git a/Resources/defaults b/Resources/LookAndFeel/defaults
similarity index 100%
rename from Resources/defaults
rename to Resources/LookAndFeel/defaults
diff --git a/Resources/metadata.desktop b/Resources/LookAndFeel/metadata.desktop
similarity index 100%
rename from Resources/metadata.desktop
rename to Resources/LookAndFeel/metadata.desktop
diff --git a/Resources/splash/Splash.qml b/Resources/Splash/Splash.qml
similarity index 92%
rename from Resources/splash/Splash.qml
rename to Resources/Splash/Splash.qml
index 6a83b57..cdda7c9 100644
--- a/Resources/splash/Splash.qml
+++ b/Resources/Splash/Splash.qml
@@ -34,16 +34,15 @@ Rectangle {
         anchors.fill: parent
         opacity: 0
 
-        // TODO: Make DropShadow more Intense
         DropShadow {
             anchors.fill: logo
-            horizontalOffset: 20
-            verticalOffset: 0
-            radius: 30.0
+            horizontalOffset: 0
+            verticalOffset: 30
+            radius: 200.0
             samples: 17
-            color: "$crust"
+            color: "#000000"
             source: logo
-            opacity: 1
+            opacity: 0.1
         }
 
         Image {
@@ -52,7 +51,6 @@ Rectangle {
             property real size: PlasmaCore.Units.gridUnit * 8
 
             anchors.centerIn: parent
-
             source: "images/Logo.png"
 
             sourceSize.width: size
diff --git a/Resources/Splash/images/Latte_Logo.png b/Resources/Splash/images/Latte_Logo.png
new file mode 100644
index 0000000..13086e3
Binary files /dev/null and b/Resources/Splash/images/Latte_Logo.png differ
diff --git a/Resources/splash/images/Logo.png b/Resources/Splash/images/Logo.png
similarity index 100%
rename from Resources/splash/images/Logo.png
rename to Resources/Splash/images/Logo.png
diff --git a/Resources/splash/images/busywidget.svg b/Resources/Splash/images/busywidget.svg
similarity index 100%
rename from Resources/splash/images/busywidget.svg
rename to Resources/Splash/images/busywidget.svg
diff --git a/Resources/aurorae/CatppuccinFrappe-Classic/CatppuccinFrappe-Classicrc b/Resources/aurorae/CatppuccinFrappe-Classic/CatppuccinFrappe-Classicrc
deleted file mode 100644
index 7d9cb5a..0000000
--- a/Resources/aurorae/CatppuccinFrappe-Classic/CatppuccinFrappe-Classicrc
+++ /dev/null
@@ -1,42 +0,0 @@
-[General]
-ActiveTextColor=198, 208, 245
-InactiveTextColor=181, 191, 226
-LeftButtons=XIA
-RightButtons=
-Shadow=false
-TextShadowOffsetX=1
-TextShadowOffsetY=1
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-UseTextShadow=false
-Animation=0
-
-[Layout]
-BorderTop=0
-BorderLeft=0
-BorderRight=0
-BorderBottom=0
-ButtonHeight=18
-ButtonWidth=18
-ButtonMarginTop=2
-ButtonMarginLeft=4
-ButtonMarginRight=4
-ButtonSpacing=12
-ExplicitButtonSpacer=10
-PaddingBottom=67
-PaddingLeft=54
-PaddingRight=54
-PaddingTop=44
-TitleBorderLeft=1
-TitleBorderRight=1
-TitleEdgeBottom=8
-TitleEdgeBottomMaximized=8
-TitleEdgeTopMaximized=4
-TitleEdgeLeftMaximized=8
-TitleEdgeRightMaximized=8
-TitleEdgeLeft=8
-TitleEdgeRight=8
-TitleEdgeTop=8
-TitleHeight=16
-
-
diff --git a/Resources/aurorae/CatppuccinFrappe-Modern/CatppuccinFrappe-Modernrc b/Resources/aurorae/CatppuccinFrappe-Modern/CatppuccinFrappe-Modernrc
deleted file mode 100755
index 6dc2685..0000000
--- a/Resources/aurorae/CatppuccinFrappe-Modern/CatppuccinFrappe-Modernrc
+++ /dev/null
@@ -1,41 +0,0 @@
-[General]
-ActiveTextColor=#cdd6f4
-InactiveTextColor=#a6adc8
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-Animation=0
-
-[Layout]
-BorderTop=0
-BorderLeft=0
-BorderRight=0
-BorderBottom=0
-
-ButtonHeight=46
-ButtonWidth=46
-
-ButtonMarginTop=0
-ButtonMarginLeft=0
-ButtonMarginRight=0
-
-ButtonSpacing=0
-ExplicitButtonSpacer=0
-
-PaddingBottom=65
-PaddingLeft=53
-PaddingRight=53
-PaddingTop=43
-
-TitleBorderLeft=0
-TitleBorderRight=-105
-
-TitleEdgeBottomMaximized=0
-TitleEdgeTopMaximized=0
-TitleEdgeLeftMaximized=0
-TitleEdgeRightMaximized=0
-
-TitleEdgeBottom=0
-TitleEdgeLeft=0
-TitleEdgeRight=0
-TitleEdgeTop=0
-TitleHeight=37
diff --git a/Resources/aurorae/CatppuccinMacchiato-Classic/CatppuccinMacchiato-Classicrc b/Resources/aurorae/CatppuccinMacchiato-Classic/CatppuccinMacchiato-Classicrc
deleted file mode 100644
index bca607c..0000000
--- a/Resources/aurorae/CatppuccinMacchiato-Classic/CatppuccinMacchiato-Classicrc
+++ /dev/null
@@ -1,42 +0,0 @@
-[General]
-ActiveTextColor=202, 211, 245
-InactiveTextColor=184, 192, 224
-LeftButtons=XIA
-RightButtons=
-Shadow=false
-TextShadowOffsetX=1
-TextShadowOffsetY=1
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-UseTextShadow=false
-Animation=0
-
-[Layout]
-BorderTop=0
-BorderLeft=0
-BorderRight=0
-BorderBottom=0
-ButtonHeight=18
-ButtonWidth=18
-ButtonMarginTop=2
-ButtonMarginLeft=4
-ButtonMarginRight=4
-ButtonSpacing=12
-ExplicitButtonSpacer=10
-PaddingBottom=67
-PaddingLeft=54
-PaddingRight=54
-PaddingTop=44
-TitleBorderLeft=1
-TitleBorderRight=1
-TitleEdgeBottom=8
-TitleEdgeBottomMaximized=8
-TitleEdgeTopMaximized=4
-TitleEdgeLeftMaximized=8
-TitleEdgeRightMaximized=8
-TitleEdgeLeft=8
-TitleEdgeRight=8
-TitleEdgeTop=8
-TitleHeight=16
-
-
diff --git a/Resources/aurorae/CatppuccinMacchiato-Modern/CatppuccinMacchiato-Modernrc b/Resources/aurorae/CatppuccinMacchiato-Modern/CatppuccinMacchiato-Modernrc
deleted file mode 100755
index 6dc2685..0000000
--- a/Resources/aurorae/CatppuccinMacchiato-Modern/CatppuccinMacchiato-Modernrc
+++ /dev/null
@@ -1,41 +0,0 @@
-[General]
-ActiveTextColor=#cdd6f4
-InactiveTextColor=#a6adc8
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-Animation=0
-
-[Layout]
-BorderTop=0
-BorderLeft=0
-BorderRight=0
-BorderBottom=0
-
-ButtonHeight=46
-ButtonWidth=46
-
-ButtonMarginTop=0
-ButtonMarginLeft=0
-ButtonMarginRight=0
-
-ButtonSpacing=0
-ExplicitButtonSpacer=0
-
-PaddingBottom=65
-PaddingLeft=53
-PaddingRight=53
-PaddingTop=43
-
-TitleBorderLeft=0
-TitleBorderRight=-105
-
-TitleEdgeBottomMaximized=0
-TitleEdgeTopMaximized=0
-TitleEdgeLeftMaximized=0
-TitleEdgeRightMaximized=0
-
-TitleEdgeBottom=0
-TitleEdgeLeft=0
-TitleEdgeRight=0
-TitleEdgeTop=0
-TitleHeight=37
diff --git a/install.sh b/install.sh
index 6bd2b1a..2cca4ed 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 COLORDIR=~/.local/share/color-schemes
 AURORAEDIR=~/.local/share/aurorae/themes
@@ -17,11 +17,11 @@ echo ""
 echo "Choose flavor out of -
  1. Mocha
  2. Macchiato 
- 3. Frappe
+ 3. Frappé
  4. Latte 
 (Type the number corresponding to said pallet)
 "
-read FLAVOUR
+read -r FLAVOUR
 clear
 if [[ $FLAVOUR == "1" ]]; then
     echo "The pallet Mocha(1) was selected";
@@ -55,7 +55,7 @@ echo "Choose an accent -
  13. Blue
  14. Lavender
 "
-read ACCENT
+read -r ACCENT
 clear
 # Sets accent based on the pallet selected (Best to fold this in your respective editor)
 if [[ $ACCENT == "1" ]]; then
@@ -234,12 +234,12 @@ echo "Choose window decoration style -
  1. Modern (Mixed)
  2. Classic (MacOS like)
 "
-read WINDECSTYLE
+read -r WINDECSTYLE
 clear
 
 if [[ $WINDECSTYLE == "1" ]]; then
     WINDECSTYLENAME=Modern
-    WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOURNAME-Modern
+    WINDECSTYLECODE=__aurorae__svg__Catppuccin"$FLAVOURNAME"-Modern
     echo "Hey! thanks for picking 'Modern', this one has a few rules or else it might break
  1: Use 3 icons on the right, With the 'Close' Button on the Far-Right
  2: If you would like the pin on all desktops button, You need to place it on the left."
@@ -247,11 +247,10 @@ if [[ $WINDECSTYLE == "1" ]]; then
     sleep 2
 elif [[ $WINDECSTYLE == "2" ]]; then
     WINDECSTYLENAME=Classic
-    WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOURNAME-Classic
+    WINDECSTYLECODE=__aurorae__svg__Catppuccin"$FLAVOURNAME"-Classic
 fi
 
 function ModifyLightlyPlasma {
-
     rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/icons/*
     rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/translucent
     rm $DESKTOPTHEMEDIR/lightly-plasma-git/widgets/tabbar.svgz
@@ -270,48 +269,67 @@ function ModifyLightlyPlasma {
 
 function AuroraeInstall {
     if [[ $WINDECSTYLE == "1" ]]; then
-        cp ./Resources/aurorae/Catppuccin$FLAVOURNAME-Modern $AURORAEDIR -r;
+        cp ./Resources/Aurorae/Catppuccin"$FLAVOURNAME"-Modern $AURORAEDIR -r
+        if [[ $FLAVOUR = "4" ]]; then
+            cp ./Resources/Aurorae/Common/CatppuccinLatte-Modernrc $AURORAEDIR/CatppuccinLatte-Modern/CatppuccinLatte-Modernrc
+        else
+            cp ./Resources/Aurorae/Common/Catppuccin-Modernrc $AURORAEDIR/Catppuccin"$FLAVOURNAME"-Modern/Catppuccin"$FLAVOURNAME"-Modernrc
+        fi
     elif [[ $WINDECSTYLE == "2" ]]; then
-        cp ./Resources/aurorae/Catppuccin$FLAVOURNAME-Classic $AURORAEDIR -r;
+        cp ./Resources/Aurorae/Catppuccin"$FLAVOURNAME"-Classic $AURORAEDIR -r
+        if [[ $FLAVOUR = "4" ]]; then
+            cp ./Resources/Aurorae/Common/CatppuccinLatte-Classicrc $AURORAEDIR/CatppuccinLatte-Classic/CatppuccinLatte-Classicrc
+        else
+            cp ./Resources/Aurorae/Common/Catppuccin-Classicrc $AURORAEDIR/Catppuccin"$FLAVOURNAME"-Classic/Catppuccin"$FLAVOURNAME"-Classicrc
+        fi
     fi
 }
 
 function BuildColorscheme {
     # Add Metadata & Replace Accent in colors file
-    sed -e s/--accentColor/$ACCENTCOLOR/g -e s/--flavour/$FLAVOURNAME/g -e s/--accentName/$ACCENTNAME/g ./Resources/base.colors > ./dist/base.colors
+    sed -e s/--accentColor/"$ACCENTCOLOR"/g -e s/--flavour/"$FLAVOURNAME"/g -e s/--accentName/"$ACCENTNAME"/g ./Resources/Base.colors > ./dist/base.colors
+
     # Hydrate Metadata with Pallet + Accent Info
-    sed -e s/--accentName/$ACCENTNAME/g -e s/--flavour/$FLAVOURNAME/g ./Resources/metadata.desktop > ./dist/Catppuccin-$FLAVOURNAME-$ACCENTNAME/metadata.desktop
+    sed -e s/--accentName/"$ACCENTNAME"/g -e s/--flavour/"$FLAVOURNAME"/g ./Resources/LookAndFeel/metadata.desktop > ./dist/Catppuccin-"$FLAVOURNAME"-"$ACCENTNAME"/metadata.desktop
+
     # Modify 'defaults' to set the correct Aurorae Theme
-    sed -e s/--accentName/$ACCENTNAME/g -e s/--flavour/$FLAVOURNAME/g -e s/--aurorae/$WINDECSTYLECODE/g ./Resources/defaults > ./dist/Catppuccin-$FLAVOURNAME-$ACCENTNAME/contents/defaults
+    sed -e s/--accentName/"$ACCENTNAME"/g -e s/--flavour/"$FLAVOURNAME"/g -e s/--aurorae/"$WINDECSTYLECODE"/g ./Resources/LookAndFeel/defaults > ./dist/Catppuccin-"$FLAVOURNAME"-"$ACCENTNAME"/contents/defaults
+
     # Hydrate Dummy colors according to Pallet
-    FLAVOURNAME=$FLAVOURNAME ACCENTNAME=$ACCENTNAME ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOURNAME$ACCENTNAME.colors -s ./dist/base.colors
+    FLAVOURNAME=$FLAVOURNAME ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOURNAME$ACCENTNAME.colors -s ./dist/base.colors
 }
 
 function BuildSplashScreen {
     # Hydrate Dummy colors according to Pallet
-    FLAVOURNAME=$FLAVOURNAME ./Installer/color-build.sh -s ./Resources/splash/images/busywidget.svg -o ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
-    # Replace Accent in colors file
-    sed ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/$ACCENTCOLOR/g > ./dist/$GLOBALTHEMENAME/contents/splash/images/busywidget.svg
+    FLAVOURNAME="$FLAVOURNAME" ./Installer/color-build.sh -s ./Resources/Splash/images/busywidget.svg -o ./dist/"$GLOBALTHEMENAME"/contents/splash/images/_busywidget.svg
+
+    # Replace Accent in Loader SVG
+    sed ./dist/"$GLOBALTHEMENAME"/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/"$ACCENTCOLOR"/g > ./dist/"$GLOBALTHEMENAME"/contents/splash/images/busywidget.svg
+
     # Cleanup temporary file
-    rm ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
+    rm ./dist/"$GLOBALTHEMENAME"/contents/splash/images/_busywidget.svg
+
     # Hydrate Dummy colors according to Pallet (QML file)
-    FLAVOURNAME=$FLAVOURNAME ./Installer/color-build.sh -s ./Resources/splash/Splash.qml -o ./dist/$GLOBALTHEMENAME/contents/splash/Splash.qml
-    # Add CTP Logo
-    # TODO: Switch between latte & mocha logo based on Pallet
-    cp ./Resources/splash/images/Logo.png ./dist/$GLOBALTHEMENAME/contents/splash/images
+    FLAVOURNAME="$FLAVOURNAME" ./Installer/color-build.sh -s ./Resources/Splash/Splash.qml -o ./dist/"$GLOBALTHEMENAME"/contents/splash/Splash.qml
+
+    if [[ $FLAVOUR == "4" ]]; then
+        cp ./Resources/Splash/images/Latte_Logo.png ./dist/"$GLOBALTHEMENAME"/contents/splash/images/Logo.png
+    else
+        cp ./Resources/Splash/images/Logo.png ./dist/"$GLOBALTHEMENAME"/contents/splash/images/Logo.png
+    fi
 }
 
 echo ""
 echo "Install $FLAVOURNAME $ACCENTNAME? with the $WINDECSTYLENAME window Decorations? [Y/n]:"
-read CONFIRMATION
+read -r CONFIRMATION
 clear
 
 if [[ $CONFIRMATION == "Y" ]] || [[ $CONFIRMATION == "y" ]]; then
 
     # Prepare Global Theme Folder
     GLOBALTHEMENAME="Catppuccin-$FLAVOURNAME-$ACCENTNAME"
-    cp -r ./Resources/Catppuccin-$FLAVOURNAME-Global ./dist/$GLOBALTHEMENAME
-    mkdir -p ./dist/$GLOBALTHEMENAME/contents/splash/images
+    cp -r ./Resources/LookAndFeel/Catppuccin-"$FLAVOURNAME"-Global ./dist/"$GLOBALTHEMENAME"
+    mkdir -p ./dist/"$GLOBALTHEMENAME"/contents/splash/images
     
     # Build SplashScreen
     echo "Building SplashScreen.."
@@ -325,17 +343,18 @@ if [[ $CONFIRMATION == "Y" ]] || [[ $CONFIRMATION == "y" ]]; then
 
     # Install Colorscheme
     echo "Installing Colorscheme.."
-    mv ./dist/Catppuccin$FLAVOURNAME$ACCENTNAME.colors $COLORDIR
+    mv ./dist/Catppuccin"$FLAVOURNAME$ACCENTNAME".colors $COLORDIR
 
     # Install Global Theme.
-    # This refers to the QDBusConnection: error: could not send signal to service error which has no effect in our testing on the working of this Installer.
+    # This refers to the QDBusConnection: error: could not send signal to service error
+    # Which has had no effect in our testing on the working of this Installer.
     echo "
  WARNING: There might be some errors that might not affect the installer at all during this step, Please advise.
     "
     sleep 1
     echo "Installing Global Theme.."
-    cd ./dist && tar -cf $GLOBALTHEMENAME.tar.gz $GLOBALTHEMENAME
-    kpackagetool5 -i $GLOBALTHEMENAME.tar.gz
+    cd ./dist && tar -cf "$GLOBALTHEMENAME".tar.gz "$GLOBALTHEMENAME"
+    kpackagetool5 -i "$GLOBALTHEMENAME".tar.gz
     cd ..
 
     echo "Modifying lightly plasma theme.."
@@ -351,10 +370,10 @@ if [[ $CONFIRMATION == "Y" ]] || [[ $CONFIRMATION == "y" ]]; then
     # Apply theme
     echo ""
     echo "Do you want to apply theme? [Y/n]:"
-    read CONFIRMATION
+    read -r CONFIRMATION
 
     if [[ $CONFIRMATION == "Y" ]] || [[ $CONFIRMATION == "y" ]]; then
-        lookandfeeltool -a $GLOBALTHEMENAME
+        lookandfeeltool -a "$GLOBALTHEMENAME"
         clear
     else
         echo "You can apply theme at any time using system settings"