diff --git a/scripts/Arch/Drivers/Surface/main.fish b/scripts/Arch/Drivers/Surface/main.fish
index b185eb72..93e7e355 100755
--- a/scripts/Arch/Drivers/Surface/main.fish
+++ b/scripts/Arch/Drivers/Surface/main.fish
@@ -37,7 +37,7 @@ begin
     end
 
     function configureSW -V dir
-        fish "$dir/../../Software/GRUB/main.fish" configure
+        fish "$dir/../../Software/grub/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish
index 4d20e40e..dc323e1d 100755
--- a/scripts/Arch/OS/install.fish
+++ b/scripts/Arch/OS/install.fish
@@ -17,7 +17,7 @@ begin
         and source "$dir/../Software/pacman/main.fish"
         and source "$dir/../Software/yay/main.fish"
 
-        and source "$dir/../Software/PowerShell/main.fish"
+        and source "$dir/../Software/powershell/main.fish"
 
         and yayinst \
             linux-headers \
diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 7fe03a7a..a3ead53e 100755
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -81,7 +81,7 @@ begin
             and echo (getOSConfig hostname) | arch-chroot "$mountDir" tee /etc/hostname >/dev/null
 
             and arch-chroot "$mountDir" mkinitcpio -P
-            and runInOS fish "$tempDir/../Software/GRUB/main.fish"
+            and runInOS fish "$tempDir/../Software/grub/main.fish"
 
             and if set -l keyLayout (getOSConfig keyboardLayout)
                 set -l serviceName set-keymap.service
diff --git a/scripts/Arch/Scripts/deploy.fish b/scripts/Arch/Scripts/deploy.fish
index cf7034d2..ec47f4fd 100644
--- a/scripts/Arch/Scripts/deploy.fish
+++ b/scripts/Arch/Scripts/deploy.fish
@@ -69,7 +69,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
         and source "$dir/../../Common/Software/nuke-usb/main.fish" $argv
         and source "$dir/../Software/sudo/main.fish" $argv
         and source "$dir/../Software/aliae/main.fish" $argv
-        and source "$dir/../Software/Oh My Posh/main.fish" $argv
+        and source "$dir/../Software/oh-my-posh/main.fish" $argv
         and source "$dir/../Software/openssh/main.fish" $argv
         and source "$dir/../Software/vim/main.fish" $argv
         and source "$dir/../Software/git/main.fish" $argv
@@ -90,7 +90,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
     end
 
     and if collectionActive desktopExperience
-        source "$dir/../Software/KDE/main.fish" $argv
+        source "$dir/../Software/plasma/main.fish" $argv
         and source "$dir/../Software/sddm/main.fish" $argv
 
         and if $isInstall
@@ -159,13 +159,13 @@ function deploySoftware -d "Deploys a the specified software action" -a action
         end
 
         # Internet Access
-        and source "$dir/../Software/Firefox/main.fish" $argv
+        and source "$dir/../Software/firefox/main.fish" $argv
         and source "$dir/../Software/brave/main.fish" $argv
-        and source "$dir/../Software/Pennywise/main.fish" $argv
+        and source "$dir/../Software/pennywise/main.fish" $argv
 
         # Virtualization
         and source "$dir/../Software/waydroid/main.fish" $argv
-        and source "$dir/../Software/Virtual Machine Manager/main.fish" $argv
+        and source "$dir/../Software/virt-manager/main.fish" $argv
 
         and if collectionActive coding
             if $isInstall
@@ -203,7 +203,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                     tnef
             end
 
-            and source "$dir/../Software/IcedTea/main.fish" $argv
+            and source "$dir/../Software/icedtea/main.fish" $argv
         end
     end
 
@@ -270,7 +270,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 ) esbonio
         end
 
-        and source "$dir/../Software/n/main.fish" $argv
+        and source "$dir/../Software/nodejs-n/main.fish" $argv
         and source "$dir/../Software/docker/main.fish" $argv
     end
 
@@ -297,7 +297,7 @@ function deploySoftware -d "Deploys a the specified software action" -a action
             and sudo flatpak install -y flathub com.usebottles.bottles
         end
 
-        and source "$dir/../Software/Lutris/main.fish" $argv
+        and source "$dir/../Software/lutris/main.fish" $argv
         and source "$dir/../Software/steam/main.fish" $argv
     end
 
diff --git a/scripts/Arch/Software/Firefox/main.fish b/scripts/Arch/Software/firefox/main.fish
similarity index 75%
rename from scripts/Arch/Software/Firefox/main.fish
rename to scripts/Arch/Software/firefox/main.fish
index 70c4217b..41fa50a7 100755
--- a/scripts/Arch/Software/Firefox/main.fish
+++ b/scripts/Arch/Software/firefox/main.fish
@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    inherit "$dir/../../../Common/Software/Firefox/main.fish"
+    inherit "$dir/../../../Common/Software/firefox/main.fish"
 
     function installSW -V dir
         yayinst firefox
diff --git a/scripts/Arch/Software/GRUB/main.fish b/scripts/Arch/Software/grub/main.fish
similarity index 80%
rename from scripts/Arch/Software/GRUB/main.fish
rename to scripts/Arch/Software/grub/main.fish
index 0db35958..8a416380 100755
--- a/scripts/Arch/Software/GRUB/main.fish
+++ b/scripts/Arch/Software/grub/main.fish
@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    inherit "$dir/../../../Common/Software/GRUB/main.fish"
+    inherit "$dir/../../../Common/Software/grub/main.fish"
 
     function installSW -V dir
         pacinst \
diff --git a/scripts/Arch/Software/IcedTea/main.fish b/scripts/Arch/Software/icedtea/main.fish
similarity index 100%
rename from scripts/Arch/Software/IcedTea/main.fish
rename to scripts/Arch/Software/icedtea/main.fish
diff --git a/scripts/Arch/Software/Lutris/main.fish b/scripts/Arch/Software/lutris/main.fish
similarity index 100%
rename from scripts/Arch/Software/Lutris/main.fish
rename to scripts/Arch/Software/lutris/main.fish
diff --git a/scripts/Arch/Software/n/main.fish b/scripts/Arch/Software/nodejs-n/main.fish
similarity index 87%
rename from scripts/Arch/Software/n/main.fish
rename to scripts/Arch/Software/nodejs-n/main.fish
index cf5f938c..b319581f 100755
--- a/scripts/Arch/Software/n/main.fish
+++ b/scripts/Arch/Software/nodejs-n/main.fish
@@ -8,7 +8,7 @@ begin
     end
 
     function configureSW -V dir
-        sudo --preserve-env --set-home fish "$dir/../../../Common/Software/n/main.fish" configure
+        sudo --preserve-env --set-home fish "$dir/../../../Common/Software/nodejs-n/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Arch/Software/Oh My Posh/main.fish b/scripts/Arch/Software/oh-my-posh/main.fish
similarity index 75%
rename from scripts/Arch/Software/Oh My Posh/main.fish
rename to scripts/Arch/Software/oh-my-posh/main.fish
index 7641fffd..c73b8015 100755
--- a/scripts/Arch/Software/Oh My Posh/main.fish	
+++ b/scripts/Arch/Software/oh-my-posh/main.fish
@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    inherit "$dir/../../../Common/Software/Oh My Posh/main.fish"
+    inherit "$dir/../../../Common/Software/oh-my-posh/main.fish"
 
     function installSW
         yayinst oh-my-posh-bin
diff --git a/scripts/Arch/Software/Pennywise/main.fish b/scripts/Arch/Software/pennywise/main.fish
similarity index 100%
rename from scripts/Arch/Software/Pennywise/main.fish
rename to scripts/Arch/Software/pennywise/main.fish
diff --git a/scripts/Arch/Software/KDE/main.fish b/scripts/Arch/Software/plasma/main.fish
similarity index 100%
rename from scripts/Arch/Software/KDE/main.fish
rename to scripts/Arch/Software/plasma/main.fish
diff --git a/scripts/Arch/Software/PowerShell/main.fish b/scripts/Arch/Software/powershell/main.fish
similarity index 75%
rename from scripts/Arch/Software/PowerShell/main.fish
rename to scripts/Arch/Software/powershell/main.fish
index 04b9379e..3f77781e 100755
--- a/scripts/Arch/Software/PowerShell/main.fish
+++ b/scripts/Arch/Software/powershell/main.fish
@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    inherit "$dir/../../../Common/Software/PowerShell/main.fish"
+    inherit "$dir/../../../Common/Software/powershell/main.fish"
 
     function installSW
         yayinst powershell-bin
diff --git a/scripts/Arch/Software/Virtual Machine Manager/main.fish b/scripts/Arch/Software/virt-manager/main.fish
similarity index 87%
rename from scripts/Arch/Software/Virtual Machine Manager/main.fish
rename to scripts/Arch/Software/virt-manager/main.fish
index 10e37547..8833d411 100755
--- a/scripts/Arch/Software/Virtual Machine Manager/main.fish	
+++ b/scripts/Arch/Software/virt-manager/main.fish
@@ -2,7 +2,7 @@
 begin
     set -l dir (status dirname)
     source "$dir/../../Scripts/software.fish"
-    inherit "$dir/../../../Common/Software/Virtual Machine Manager/main.fish"
+    inherit "$dir/../../../Common/Software/virt-manager/main.fish"
 
     function installSW
         yayinst qemu-full
diff --git a/scripts/Common/Drivers/Logitech G903/main.fish b/scripts/Common/Drivers/Logitech G903/main.fish
index d9cca5ed..813f996e 100644
--- a/scripts/Common/Drivers/Logitech G903/main.fish	
+++ b/scripts/Common/Drivers/Logitech G903/main.fish	
@@ -4,7 +4,7 @@ begin
     source "$dir/../../Scripts/software.fish"
 
     function configureSW -V dir
-        . "$dir/../../Software/KDE/input.fish"
+        . "$dir/../../Software/plasma/input.fish"
         addInputConfig 1133 16519 "Logitech G903 LS" "PointerAccelerationProfile=1"
     end
 
diff --git a/scripts/Common/Drivers/SurfaceBook2/main.fish b/scripts/Common/Drivers/SurfaceBook2/main.fish
index 436f0aa9..7d74c6eb 100644
--- a/scripts/Common/Drivers/SurfaceBook2/main.fish
+++ b/scripts/Common/Drivers/SurfaceBook2/main.fish
@@ -4,7 +4,7 @@ begin
     source "$dir/../../Scripts/software.fish"
 
     function configureSW -V dir
-        . "$dir/../../Software/KDE/input.fish"
+        . "$dir/../../Software/plasma/input.fish"
         addInputConfig 1118 2338 "Microsoft Surface Keyboard Touchpad" "NaturalScroll=true"
     end
 
diff --git a/scripts/Common/Scripts/Operations.ps1 b/scripts/Common/Scripts/Operations.ps1
index 756572a1..017efad9 100644
--- a/scripts/Common/Scripts/Operations.ps1
+++ b/scripts/Common/Scripts/Operations.ps1
@@ -252,7 +252,7 @@ $null = New-Module {
 
                         Install-ChocoPackage selenium-gecko-driver firefox;
                         Install-WingetPackage AutoHotkey.AutoHotkey;
-                        . "$PSScriptRoot/../../Windows/Software/PinnedItem/Main.ps1";
+                        . "$PSScriptRoot/../../Windows/Software/pinned-item/Main.ps1";
                     }
 
                     Write-Host "Installing PowerShell Modules…";
diff --git a/scripts/Common/Software/aliae/Main.ps1 b/scripts/Common/Software/aliae/Main.ps1
index a9c2bdf8..56cae6a7 100644
--- a/scripts/Common/Software/aliae/Main.ps1
+++ b/scripts/Common/Software/aliae/Main.ps1
@@ -1,5 +1,5 @@
 . "$PSScriptRoot/Constants.ps1";
-. "$PSScriptRoot/../PowerShell/Profile.ps1";
+. "$PSScriptRoot/../powershell/Profile.ps1";
 . "$PSScriptRoot/../../Scripts/Software.ps1";
 
 Start-SoftwareInstaller @args `
diff --git a/scripts/Common/Software/brave/main.fish b/scripts/Common/Software/brave/main.fish
index 0e93a351..b121d9a2 100755
--- a/scripts/Common/Software/brave/main.fish
+++ b/scripts/Common/Software/brave/main.fish
@@ -21,7 +21,7 @@ begin
             end
         end
 
-        fish "$dir/../Chromium/ytmdl.fish" "$bin" "$extensionRoot"
+        fish "$dir/../chromium/ytmdl.fish" "$bin" "$extensionRoot"
 
         for i in (seq (count $bins))
             if [ "$extensionRoots[$i]" != "$extensionRoot" ]
diff --git a/scripts/Common/Software/Chromium/extensions.fish b/scripts/Common/Software/chromium/extensions.fish
similarity index 100%
rename from scripts/Common/Software/Chromium/extensions.fish
rename to scripts/Common/Software/chromium/extensions.fish
diff --git a/scripts/Common/Software/Chromium/ytmdl.fish b/scripts/Common/Software/chromium/ytmdl.fish
similarity index 100%
rename from scripts/Common/Software/Chromium/ytmdl.fish
rename to scripts/Common/Software/chromium/ytmdl.fish
diff --git a/scripts/Common/Software/Firefox/firefox.sh b/scripts/Common/Software/firefox/firefox.sh
similarity index 100%
rename from scripts/Common/Software/Firefox/firefox.sh
rename to scripts/Common/Software/firefox/firefox.sh
diff --git a/scripts/Common/Software/Firefox/main.fish b/scripts/Common/Software/firefox/main.fish
similarity index 100%
rename from scripts/Common/Software/Firefox/main.fish
rename to scripts/Common/Software/firefox/main.fish
diff --git a/scripts/Common/Software/GRUB/main.fish b/scripts/Common/Software/grub/main.fish
similarity index 100%
rename from scripts/Common/Software/GRUB/main.fish
rename to scripts/Common/Software/grub/main.fish
diff --git a/scripts/Common/Software/minegrub-theme/main.fish b/scripts/Common/Software/minegrub-theme/main.fish
index 4aab4ca1..026dbd23 100755
--- a/scripts/Common/Software/minegrub-theme/main.fish
+++ b/scripts/Common/Software/minegrub-theme/main.fish
@@ -8,7 +8,7 @@ begin
             's/^#\?\(GRUB_THEME=\).*$/\1"\/usr\/share\/grub\/themes\/minegrub\/minegrub\/theme.txt"/' \
             /etc/default/grub
 
-        fish "$dir/../GRUB/main.fish" configure
+        fish "$dir/../grub/main.fish" configure
     end
 
     runInstaller $argv
diff --git a/scripts/Common/Software/n/main.fish b/scripts/Common/Software/nodejs-n/main.fish
similarity index 100%
rename from scripts/Common/Software/n/main.fish
rename to scripts/Common/Software/nodejs-n/main.fish
diff --git a/scripts/Common/Software/nvidia-dkms/main.fish b/scripts/Common/Software/nvidia-dkms/main.fish
index f9be627f..06074c85 100755
--- a/scripts/Common/Software/nvidia-dkms/main.fish
+++ b/scripts/Common/Software/nvidia-dkms/main.fish
@@ -26,7 +26,7 @@ begin
                     -e "s/\($indicator.*\)\(\"\)/\1$config\2/" \
                 -e "}"
 
-            fish "$dir/../GRUB/main.fish" configure
+            fish "$dir/../grub/main.fish" configure
         end
     end
 
diff --git a/scripts/Common/Software/Oh My Posh/Main.ps1 b/scripts/Common/Software/oh-my-posh/Main.ps1
similarity index 98%
rename from scripts/Common/Software/Oh My Posh/Main.ps1
rename to scripts/Common/Software/oh-my-posh/Main.ps1
index 2b6187af..b00797e8 100644
--- a/scripts/Common/Software/Oh My Posh/Main.ps1	
+++ b/scripts/Common/Software/oh-my-posh/Main.ps1
@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../aliae/Manage.ps1";
-. "$PSScriptRoot/../PowerShell/Profile.ps1";
+. "$PSScriptRoot/../powershell/Profile.ps1";
 . "$PSScriptRoot/../../Scripts/Software.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
diff --git a/scripts/Common/Software/Oh My Posh/main.fish b/scripts/Common/Software/oh-my-posh/main.fish
similarity index 100%
rename from scripts/Common/Software/Oh My Posh/main.fish
rename to scripts/Common/Software/oh-my-posh/main.fish
diff --git a/scripts/Common/Software/KDE/input.fish b/scripts/Common/Software/plasma/input.fish
similarity index 100%
rename from scripts/Common/Software/KDE/input.fish
rename to scripts/Common/Software/plasma/input.fish
diff --git a/scripts/Common/Software/posh-git/Main.ps1 b/scripts/Common/Software/posh-git/Main.ps1
index e27172c3..7ca4fa7f 100644
--- a/scripts/Common/Software/posh-git/Main.ps1
+++ b/scripts/Common/Software/posh-git/Main.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../PowerShell/Module.ps1";
+. "$PSScriptRoot/../powershell/Module.ps1";
 . "$PSScriptRoot/../../Scripts/Software.ps1";
 
 $parameters = Get-ModuleInstallerComponents "posh-git";
diff --git a/scripts/Common/Software/PowerShell/Main.ps1 b/scripts/Common/Software/powershell/Main.ps1
similarity index 95%
rename from scripts/Common/Software/PowerShell/Main.ps1
rename to scripts/Common/Software/powershell/Main.ps1
index 0e99fcbc..c9ca7e63 100644
--- a/scripts/Common/Software/PowerShell/Main.ps1
+++ b/scripts/Common/Software/powershell/Main.ps1
@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../../Scripts/Software.ps1";
-. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
+. "$PSScriptRoot/../../Software/powershell/Profile.ps1";
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `
diff --git a/scripts/Common/Software/PowerShell/Module.ps1 b/scripts/Common/Software/powershell/Module.ps1
similarity index 96%
rename from scripts/Common/Software/PowerShell/Module.ps1
rename to scripts/Common/Software/powershell/Module.ps1
index 3a0c4a68..7d83687a 100644
--- a/scripts/Common/Software/PowerShell/Module.ps1
+++ b/scripts/Common/Software/powershell/Module.ps1
@@ -1,7 +1,7 @@
 . "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
 $null = New-Module {
-    . "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
+    . "$PSScriptRoot/../../Software/powershell/Profile.ps1";
 
     <#
         .SYNOPSIS
diff --git a/scripts/Common/Software/PowerShell/Profile.ps1 b/scripts/Common/Software/powershell/Profile.ps1
similarity index 100%
rename from scripts/Common/Software/PowerShell/Profile.ps1
rename to scripts/Common/Software/powershell/Profile.ps1
diff --git a/scripts/Common/Software/PowerShell/main.fish b/scripts/Common/Software/powershell/main.fish
similarity index 100%
rename from scripts/Common/Software/PowerShell/main.fish
rename to scripts/Common/Software/powershell/main.fish
diff --git a/scripts/Common/Software/Terminal-Icons/Main.ps1 b/scripts/Common/Software/terminal-icons/Main.ps1
similarity index 77%
rename from scripts/Common/Software/Terminal-Icons/Main.ps1
rename to scripts/Common/Software/terminal-icons/Main.ps1
index 240e9afa..d2f2142f 100644
--- a/scripts/Common/Software/Terminal-Icons/Main.ps1
+++ b/scripts/Common/Software/terminal-icons/Main.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../PowerShell/Module.ps1";
+. "$PSScriptRoot/../powershell/Module.ps1";
 . "$PSScriptRoot/../../Scripts/Software.ps1";
 
 $parameters = Get-ModuleInstallerComponents "Terminal-Icons";
diff --git a/scripts/Common/Software/Terminal-Icons/main.fish b/scripts/Common/Software/terminal-icons/main.fish
similarity index 100%
rename from scripts/Common/Software/Terminal-Icons/main.fish
rename to scripts/Common/Software/terminal-icons/main.fish
diff --git a/scripts/Common/Software/Virtual Machine Manager/main.fish b/scripts/Common/Software/virt-manager/main.fish
similarity index 100%
rename from scripts/Common/Software/Virtual Machine Manager/main.fish
rename to scripts/Common/Software/virt-manager/main.fish
diff --git a/scripts/Common/Software/zoxide/Main.ps1 b/scripts/Common/Software/zoxide/Main.ps1
index def8a5f4..aabaf8f8 100644
--- a/scripts/Common/Software/zoxide/Main.ps1
+++ b/scripts/Common/Software/zoxide/Main.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../PowerShell/Profile.ps1";
+. "$PSScriptRoot/../powershell/Profile.ps1";
 . "$PSScriptRoot/../../Scripts/Software.ps1";
 
 Start-SoftwareInstaller @args `
diff --git a/scripts/Windows/Drivers/Tobii EyeX/Main.ps1 b/scripts/Windows/Drivers/Tobii EyeX/Main.ps1
index b9618f45..441ebee9 100644
--- a/scripts/Windows/Drivers/Tobii EyeX/Main.ps1	
+++ b/scripts/Windows/Drivers/Tobii EyeX/Main.ps1	
@@ -4,8 +4,8 @@
     $softwarePath = "$PSScriptRoot/../../Software";
 
     $appScripts = @(
-        "$softwarePath/TobiiGhost/Main.ps1",
-        "$softwarePath/TobiiGameHub/Main.ps1"
+        "$softwarePath/tobii-ghost/Main.ps1",
+        "$softwarePath/tobii-gamehub/Main.ps1"
     );
 
     Start-SoftwareInstaller @args `
diff --git a/scripts/Windows/Scripts/Deployment.ps1 b/scripts/Windows/Scripts/Deployment.ps1
index 45eff392..c8fb3599 100644
--- a/scripts/Windows/Scripts/Deployment.ps1
+++ b/scripts/Windows/Scripts/Deployment.ps1
@@ -91,26 +91,26 @@ function Deploy-SoftwareAction {
         $commonSoftware = "$PSScriptRoot/../../Common/Software";
 
         # Windows Config
-        & "$softwarePath/Windows/Main.ps1" @arguments;
+        & "$softwarePath/windows/Main.ps1" @arguments;
 
         if ($hardware.logitechG) {
-            & "$softwarePath/LGHub/Main.ps1" @arguments;
+            & "$softwarePath/lghub/Main.ps1" @arguments;
         }
 
         # Essentials
         if ($collections.essential) {
             & "$softwarePath/aliae/Main.ps1" @arguments;
             & "$softwarePath/git/Main.ps1" @arguments;
-            & "$softwarePath/OpenSSH/Main.ps1" @arguments;
-            & "$softwarePath/PowerShell/Main.ps1" @arguments;
+            & "$softwarePath/openssh/Main.ps1" @arguments;
+            & "$softwarePath/powershell/Main.ps1" @arguments;
             & "$softwarePath/chocolatey/Main.ps1" @arguments;
             & "$softwarePath/zoxide/Main.ps1" @arguments;
             & "$commonSoftware/posh-git/Main.ps1" @arguments;
-            & "$commonSoftware/Terminal-Icons/Main.ps1" @arguments;
-            & "$softwarePath/Oh My Posh/Main.ps1" @arguments;
+            & "$commonSoftware/terminal-icons/Main.ps1" @arguments;
+            & "$softwarePath/oh-my-posh/Main.ps1" @arguments;
 
             if (Get-OSConfig "dualboot") {
-                & "$softwarePath/Ext4Fsd/Main.ps1" @arguments;
+                & "$softwarePath/ext4fsd/Main.ps1" @arguments;
             }
 
             if ($install) {
@@ -127,9 +127,9 @@ function Deploy-SoftwareAction {
 
         # Common Software
         if ($collections.common) {
-            & "$softwarePath/WinSCP/Main.ps1" @arguments;
-            & "$softwarePath/Thunderbird/Main.ps1" @arguments;
-            & "$softwarePath/PuTTY/Main.ps1" @arguments;
+            & "$softwarePath/winscp/Main.ps1" @arguments;
+            & "$softwarePath/thunderbird/Main.ps1" @arguments;
+            & "$softwarePath/putty/Main.ps1" @arguments;
 
             if ($install) {
                 Install-ChocoPackage `
@@ -198,14 +198,14 @@ function Deploy-SoftwareAction {
             }
 
             # ToDo: Consider hiding behind own config?
-            & "$softwarePath/Ubiquiti UniFi Controller/Main.ps1" @arguments;
+            & "$softwarePath/ubiquiti-unifi-controller/Main.ps1" @arguments;
 
             # Internet Access
-            & "$softwarePath/Firefox/Main.ps1" @arguments;
-            & "$softwarePath/MSEdgeRedirect/Main.ps1" @arguments;
+            & "$softwarePath/firefox/Main.ps1" @arguments;
+            & "$softwarePath/msedge-redirect/Main.ps1" @arguments;
 
             if ($collections.fileSync) {
-                & "$softwarePath/Nextcloud/Main.ps1" @arguments;
+                & "$softwarePath/nextcloud/Main.ps1" @arguments;
             }
         }
 
@@ -260,10 +260,10 @@ function Deploy-SoftwareAction {
             }
 
             & "$softwarePath/vscode/Main.ps1" @arguments;
-            & "$softwarePath/VisualStudio/Main.ps1" @arguments;
+            & "$softwarePath/visualstudio/Main.ps1" @arguments;
 
             # Node.js
-            & "$softwarePath/NVS/Main.ps1" @arguments;
+            & "$softwarePath/nvs/Main.ps1" @arguments;
         }
 
         # Gaming
@@ -292,13 +292,13 @@ function Deploy-SoftwareAction {
                 Remove-DesktopIcon "EA.*";
             }
 
-            & "$softwarePath/TrackMania Nations Forever/Main.ps1" @arguments;
-            & "$softwarePath/TrackMania United Forever/Main.ps1" @arguments;
-            & "$softwarePath/ManiaPlanet/Main.ps1" @arguments;
+            & "$softwarePath/tm-nations-forever/Main.ps1" @arguments;
+            & "$softwarePath/tm-united-forever/Main.ps1" @arguments;
+            & "$softwarePath/maniaplanet/Main.ps1" @arguments;
             & "$softwarePath/osu!/Main.ps1" @arguments;
             & "$softwarePath/osu!lazer/Main.ps1" @arguments;
-            & "$softwarePath/RetroArch/Main.ps1" @arguments;
-            & "$softwarePath/reWASD/Main.ps1" @arguments;
+            & "$softwarePath/retroarch/Main.ps1" @arguments;
+            & "$softwarePath/rewasd/Main.ps1" @arguments;
         }
     };
 }
diff --git a/scripts/Windows/Software/chocolatey/Main.ps1 b/scripts/Windows/Software/chocolatey/Main.ps1
index b675073e..a1d12388 100644
--- a/scripts/Windows/Software/chocolatey/Main.ps1
+++ b/scripts/Windows/Software/chocolatey/Main.ps1
@@ -1,7 +1,7 @@
 using namespace Microsoft.Win32;
 
 . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Common/Software/PowerShell/Profile.ps1";
+. "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1";
 
 Start-SoftwareInstaller @args `
     -Configurator {
diff --git a/scripts/Windows/Software/Ext4Fsd/Main.ps1 b/scripts/Windows/Software/ext4fsd/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Ext4Fsd/Main.ps1
rename to scripts/Windows/Software/ext4fsd/Main.ps1
diff --git a/scripts/Windows/Software/Firefox/Main.ps1 b/scripts/Windows/Software/firefox/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Firefox/Main.ps1
rename to scripts/Windows/Software/firefox/Main.ps1
diff --git a/scripts/Windows/Software/LGHub/Main.ps1 b/scripts/Windows/Software/lghub/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/LGHub/Main.ps1
rename to scripts/Windows/Software/lghub/Main.ps1
diff --git a/scripts/Windows/Software/ManiaPlanet/Main.ps1 b/scripts/Windows/Software/maniaplanet/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/ManiaPlanet/Main.ps1
rename to scripts/Windows/Software/maniaplanet/Main.ps1
diff --git a/scripts/Windows/Software/MSEdgeRedirect/Main.ps1 b/scripts/Windows/Software/msedge-redirect/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/MSEdgeRedirect/Main.ps1
rename to scripts/Windows/Software/msedge-redirect/Main.ps1
diff --git a/scripts/Windows/Software/Nextcloud/Main.ps1 b/scripts/Windows/Software/nextcloud/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Nextcloud/Main.ps1
rename to scripts/Windows/Software/nextcloud/Main.ps1
diff --git a/scripts/Windows/Software/NVS/Main.ps1 b/scripts/Windows/Software/nvs/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/NVS/Main.ps1
rename to scripts/Windows/Software/nvs/Main.ps1
diff --git a/scripts/Windows/Software/Oh My Posh/Main.ps1 b/scripts/Windows/Software/oh-my-posh/Main.ps1
similarity index 83%
rename from scripts/Windows/Software/Oh My Posh/Main.ps1
rename to scripts/Windows/Software/oh-my-posh/Main.ps1
index 5cee1621..41ad24f0 100644
--- a/scripts/Windows/Software/Oh My Posh/Main.ps1	
+++ b/scripts/Windows/Software/oh-my-posh/Main.ps1
@@ -3,7 +3,7 @@
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `
-    -Inherit "$PSScriptRoot/../../../Common/Software/Oh My Posh/Main.ps1" `
+    -Inherit "$PSScriptRoot/../../../Common/Software/oh-my-posh/Main.ps1" `
     -Installer {
         Install-WingetPackage JanDeDobbeleer.OhMyPosh -ArgumentList "--scope", "machine";
     };
diff --git a/scripts/Windows/Software/OpenSSH/Main.ps1 b/scripts/Windows/Software/openssh/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/OpenSSH/Main.ps1
rename to scripts/Windows/Software/openssh/Main.ps1
diff --git a/scripts/Windows/Software/PinnedItem/Main.ps1 b/scripts/Windows/Software/pinned-item/Main.ps1
similarity index 94%
rename from scripts/Windows/Software/PinnedItem/Main.ps1
rename to scripts/Windows/Software/pinned-item/Main.ps1
index 4809a027..7bc3712f 100644
--- a/scripts/Windows/Software/PinnedItem/Main.ps1
+++ b/scripts/Windows/Software/pinned-item/Main.ps1
@@ -1,5 +1,5 @@
 . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Common/Software/PowerShell/Module.ps1";
+. "$PSScriptRoot/../../../Common/Software/powershell/Module.ps1";
 
 $parameters = Get-ModuleInstallerComponents "PinnedItem" -NativeOnly -NoProfile;
 
diff --git a/scripts/Windows/Software/PowerShell/Main.ps1 b/scripts/Windows/Software/powershell/Main.ps1
similarity index 83%
rename from scripts/Windows/Software/PowerShell/Main.ps1
rename to scripts/Windows/Software/powershell/Main.ps1
index 29a3c1f0..c2253ba0 100644
--- a/scripts/Windows/Software/PowerShell/Main.ps1
+++ b/scripts/Windows/Software/powershell/Main.ps1
@@ -1,4 +1,4 @@
 . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
-Start-SoftwareInstaller @args -Inherit "$PSScriptRoot/../../../Common/Software/PowerShell/Main.ps1";
+Start-SoftwareInstaller @args -Inherit "$PSScriptRoot/../../../Common/Software/powershell/Main.ps1";
diff --git a/scripts/Windows/Software/PuTTY/Main.ps1 b/scripts/Windows/Software/putty/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/PuTTY/Main.ps1
rename to scripts/Windows/Software/putty/Main.ps1
diff --git a/scripts/Windows/Software/RetroArch/Main.ps1 b/scripts/Windows/Software/retroarch/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/RetroArch/Main.ps1
rename to scripts/Windows/Software/retroarch/Main.ps1
diff --git a/scripts/Windows/Software/reWASD/Main.ps1 b/scripts/Windows/Software/rewasd/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/reWASD/Main.ps1
rename to scripts/Windows/Software/rewasd/Main.ps1
diff --git a/scripts/Windows/Software/Thunderbird/Main.ps1 b/scripts/Windows/Software/thunderbird/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Thunderbird/Main.ps1
rename to scripts/Windows/Software/thunderbird/Main.ps1
diff --git a/scripts/Windows/Software/TrackMania Nations Forever/Main.ps1 b/scripts/Windows/Software/tm-nations-forever/Main.ps1
similarity index 86%
rename from scripts/Windows/Software/TrackMania Nations Forever/Main.ps1
rename to scripts/Windows/Software/tm-nations-forever/Main.ps1
index 8733153f..52a3d2c4 100644
--- a/scripts/Windows/Software/TrackMania Nations Forever/Main.ps1	
+++ b/scripts/Windows/Software/tm-nations-forever/Main.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../TrackMania United Forever/Manage.ps1";
+. "$PSScriptRoot/../tm-united-forever/Manage.ps1";
 . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
 . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
diff --git a/scripts/Windows/Software/TrackMania United Forever/Main.ps1 b/scripts/Windows/Software/tm-united-forever/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/TrackMania United Forever/Main.ps1
rename to scripts/Windows/Software/tm-united-forever/Main.ps1
diff --git a/scripts/Windows/Software/TrackMania United Forever/Manage.ps1 b/scripts/Windows/Software/tm-united-forever/Manage.ps1
similarity index 100%
rename from scripts/Windows/Software/TrackMania United Forever/Manage.ps1
rename to scripts/Windows/Software/tm-united-forever/Manage.ps1
diff --git a/scripts/Windows/Software/TobiiGameHub/GameHub.ahk b/scripts/Windows/Software/tobii-gamehub/GameHub.ahk
similarity index 100%
rename from scripts/Windows/Software/TobiiGameHub/GameHub.ahk
rename to scripts/Windows/Software/tobii-gamehub/GameHub.ahk
diff --git a/scripts/Windows/Software/TobiiGameHub/Main.ps1 b/scripts/Windows/Software/tobii-gamehub/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/TobiiGameHub/Main.ps1
rename to scripts/Windows/Software/tobii-gamehub/Main.ps1
diff --git a/scripts/Windows/Software/TobiiGhost/Ghost.ahk b/scripts/Windows/Software/tobii-ghost/Ghost.ahk
similarity index 100%
rename from scripts/Windows/Software/TobiiGhost/Ghost.ahk
rename to scripts/Windows/Software/tobii-ghost/Ghost.ahk
diff --git a/scripts/Windows/Software/TobiiGhost/Main.ps1 b/scripts/Windows/Software/tobii-ghost/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/TobiiGhost/Main.ps1
rename to scripts/Windows/Software/tobii-ghost/Main.ps1
diff --git a/scripts/Windows/Software/Ubiquiti UniFi Controller/Main.ps1 b/scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Ubiquiti UniFi Controller/Main.ps1
rename to scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1
diff --git a/scripts/Windows/Software/VisualStudio/Main.ps1 b/scripts/Windows/Software/visualstudio/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/VisualStudio/Main.ps1
rename to scripts/Windows/Software/visualstudio/Main.ps1
diff --git a/scripts/Windows/Software/Windows/Home.exclude.txt b/scripts/Windows/Software/windows/Home.exclude.txt
similarity index 100%
rename from scripts/Windows/Software/Windows/Home.exclude.txt
rename to scripts/Windows/Software/windows/Home.exclude.txt
diff --git a/scripts/Windows/Software/Windows/Main.ps1 b/scripts/Windows/Software/windows/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/Windows/Main.ps1
rename to scripts/Windows/Software/windows/Main.ps1
diff --git a/scripts/Windows/Software/WinSCP/Main.ps1 b/scripts/Windows/Software/winscp/Main.ps1
similarity index 100%
rename from scripts/Windows/Software/WinSCP/Main.ps1
rename to scripts/Windows/Software/winscp/Main.ps1
diff --git a/scripts/Windows/Software/zoxide/Main.ps1 b/scripts/Windows/Software/zoxide/Main.ps1
index 64825eb5..a9e15435 100644
--- a/scripts/Windows/Software/zoxide/Main.ps1
+++ b/scripts/Windows/Software/zoxide/Main.ps1
@@ -1,6 +1,6 @@
 . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
 . "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Common/Software/PowerShell/Profile.ps1";
+. "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1";
 . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @args `