diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 314a9b2..5fc202c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,8 @@ Lint:
     - shellcheck ./system/.config/custom/keyleds
     - shellcheck ./system/.config/custom/aliases
     - shellcheck ./system/.config/custom/env
+    - shellcheck ./system/.config/polybar/launch
+    - shellcheck ./system/.config/polybar/scripts/update-count
     - shellcheck ./system/.config/X11/xinitrc
     - shellcheck ./system/.config/zsh/.zlogout
     - shellcheck ./system/.config/zsh/.zprofile
diff --git a/system/.config/cron/crontab b/system/.config/cron/crontab
index 0ff3713..a76884b 100644
--- a/system/.config/cron/crontab
+++ b/system/.config/cron/crontab
@@ -14,7 +14,7 @@
 */30 * * * * grive -d -p $HOME/Documents/ >> $HOME/.local/log/cron.log
 
 # Sync pacman databases every 30 minutes
-*/30 * * * * sudo $HOME/.local/bin/sync_package_databases >> $HOME/.local/log/cron.log
+*/30 * * * * sudo $HOME/.local/bin/sync-package >> $HOME/.local/log/cron.log
 
 # Synchronize notes every 5 minutes
-*/5 * * * * $HOME/.local/bin/sync_notes >> $HOME/.local/log/cron.log
+*/5 * * * * $HOME/.local/bin/sync-notes >> $HOME/.local/log/cron.log
diff --git a/system/.config/i3/config b/system/.config/i3/config
index e16d9e2..1b48832 100644
--- a/system/.config/i3/config
+++ b/system/.config/i3/config
@@ -202,8 +202,8 @@ bindsym XF86Sleep exec --no-startup-id screenlock
 # Volume controls
 bindsym XF86AudioMute exec --no-startup-id pamixer -t
 bindsym $mod+m exec --no-startup-id pamixer -t
-bindsym XF86AudioRaiseVolume exec --no-startup-id increase_volume
-bindsym $mod+KP_Add exec --no-startup-id increase_volume
+bindsym XF86AudioRaiseVolume exec --no-startup-id increase-volume
+bindsym $mod+KP_Add exec --no-startup-id increase-volume
 bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 5 --allow-boost
 bindsym $mod+KP_Subtract exec --no-startup-id pamixer -d 5 --allow-boost
 
diff --git a/system/.local/bin/increase_volume b/system/.local/bin/increase-volume
similarity index 90%
rename from system/.local/bin/increase_volume
rename to system/.local/bin/increase-volume
index c3e105b..74c9f49 100755
--- a/system/.local/bin/increase_volume
+++ b/system/.local/bin/increase-volume
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # SCRIPT NAME:
-# increase_volume
+# increase-volume
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -12,7 +12,7 @@
 # using custom i3 keybindings.
 #
 # USAGE:
-# ./increase_volume
+# ./increase-volume
 if [[ $(pamixer --get-volume) -lt 150 ]]; then
     pamixer -i 5 --allow-boost
 fi
diff --git a/system/.local/bin/submodule_update b/system/.local/bin/submodule-update
similarity index 96%
rename from system/.local/bin/submodule_update
rename to system/.local/bin/submodule-update
index 9142300..a59c1a2 100755
--- a/system/.local/bin/submodule_update
+++ b/system/.local/bin/submodule-update
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # SCRIPT NAME:
-# submodule_update
+# submodule-update
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -11,7 +11,7 @@
 # new commit and pushes it. Only when there are no staged changes pending.
 #
 # USAGE:
-# ./submodule_update
+# ./submodule-update
 . utils
 
 START_DIR=$(pwd)
diff --git a/system/.local/bin/sync_notes b/system/.local/bin/sync-notes
similarity index 82%
rename from system/.local/bin/sync_notes
rename to system/.local/bin/sync-notes
index cac678d..d58631f 100755
--- a/system/.local/bin/sync_notes
+++ b/system/.local/bin/sync-notes
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # SCRIPT NAME:
-# sync_notes
+# sync-notes
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -10,10 +10,10 @@
 # Sync notes in ~/Notes using git
 #
 # USAGE:
-# ./sync_notes
+# ./sync-notes
 . /home/severin/.local/bin/utils
 
-print_time_log "sync_notes" "Synchronizing notes"
+print_time_log "sync-notes" "Synchronizing notes"
 
 cd "/home/severin/Notes" || exit
 git pull > /dev/null 2>&1
diff --git a/system/.local/bin/sync_package_databases b/system/.local/bin/sync-packages
similarity index 66%
rename from system/.local/bin/sync_package_databases
rename to system/.local/bin/sync-packages
index a1afed8..0a4de96 100755
--- a/system/.local/bin/sync_package_databases
+++ b/system/.local/bin/sync-packages
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # 
 # SCRIPT NAME:
-# sync_package_databases
+# sync-packages
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
@@ -10,8 +10,8 @@
 # Syncs the package database of pacman
 #
 # USAGE:
-# ./sync_package_databases
+# ./sync-packages
 . /home/severin/.local/bin/utils
 
-print_time_log "sync_package_databases" "Syncing databases"
+print_time_log "sync-packages" "Syncing databases"
 yay -Syy > /dev/null 2>&1
\ No newline at end of file