diff --git a/.gitignore b/.gitignore
index 5ebb5bd..51362dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,13 @@ system/.config/phpstorm/config/options/project.default.xml
 system/.config/phpstorm/config/options/updates.xml
 system/.config/phpstorm/config/options/usage.statistics.xml
 system/.config/phpstorm/config/options/recentProjectDirectories.xml
-system/.config/phpstorm/config/options/window.manager.xml
\ No newline at end of file
+system/.config/phpstorm/config/options/window.manager.xml
+system/.config/phpstorm/config/consoles
+system/.config/phpstorm/config/extensions/com.intellij.database/
+system/.config/phpstorm/config/jdbc-drivers
+system/.config/phpstorm/config/phpstorm64.vmoptions
+system/.config/phpstorm/config/options/window.state.xml
+system/.config/phpstorm/config/terminal/history/history-
+system/.config/phpstorm/config/options/runner.layout.xml
+system/.config/phpstorm/config/options/extensionsRootType.xml
+system/.config/phpstorm/config/options/databaseDrivers.xml
diff --git a/install b/install
index 9018ebe..9c64d28 100755
--- a/install
+++ b/install
@@ -143,6 +143,7 @@ COMPOSER_PACKAGES=(
 declare -A COPY_ROOT_FILES
 COPY_ROOT_FILES=(
     ["/etc/docker/daemon.json"]="644"
+    ["/etc/gemrc"]="644"
     ["/etc/mkinitcpio.conf"]="644"
     ["/etc/NetworkManager/conf.d/dns.conf"]="644"
     ["/etc/pacman.conf"]="644"
diff --git a/system/.config/custom/env b/system/.config/custom/env
index dd5bcf5..8651953 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -110,7 +110,6 @@ export PATH="${PATH}:${CARGO_HOME}/bin"
 export PATH="${PATH}:${XDG_DATA_HOME}/npm/bin"
 export PATH="${PATH}:${GOPATH}/bin"
 export PATH="${PATH}:${GEM_HOME}/bin"
-export PATH="${PATH}:${HOME}/.gem/ruby/2.6.0/bin"
 export PATH="${PATH}:${XDG_CONFIG_HOME}/composer/vendor/bin"
 export PATH="${HOME}/.local/bin:${PATH}"
 
diff --git a/system/.config/phpstorm/config/options/docker.xml b/system/.config/phpstorm/config/options/docker.xml
new file mode 100644
index 0000000..0eb4334
--- /dev/null
+++ b/system/.config/phpstorm/config/options/docker.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="DockerSettings">
+    <option name="dockerMachinePath" value="docker-machine" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/find.xml b/system/.config/phpstorm/config/options/find.xml
new file mode 100644
index 0000000..9e31a93
--- /dev/null
+++ b/system/.config/phpstorm/config/options/find.xml
@@ -0,0 +1,9 @@
+<application>
+  <component name="FindSettings">
+    <option name="customScope" value="All Places" />
+    <option name="defaultScopeName" value="All Places" />
+    <option name="wholeWordsOnly" value="true" />
+    <option name="WHOLE_WORDS_ONLY" value="true" />
+    <option name="SEARCH_SCOPE" value="All Places" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/ide.general.xml b/system/.config/phpstorm/config/options/ide.general.xml
index a4827a0..ba14c49 100644
--- a/system/.config/phpstorm/config/options/ide.general.xml
+++ b/system/.config/phpstorm/config/options/ide.general.xml
@@ -1,6 +1,7 @@
 <application>
   <component name="GeneralSettings">
     <option name="confirmExit" value="false" />
+    <option name="searchInBackground" value="true" />
     <option name="showTipsOnStartup" value="false" />
   </component>
 </application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/markdown.xml b/system/.config/phpstorm/config/options/markdown.xml
new file mode 100644
index 0000000..92e74be
--- /dev/null
+++ b/system/.config/phpstorm/config/options/markdown.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="MarkdownApplicationSettings">
+    <MarkdownCssSettings />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/remote-servers.xml b/system/.config/phpstorm/config/options/remote-servers.xml
new file mode 100644
index 0000000..1964411
--- /dev/null
+++ b/system/.config/phpstorm/config/options/remote-servers.xml
@@ -0,0 +1,10 @@
+<application>
+  <component name="RemoteServers">
+    <remote-server name="Docker" type="docker">
+      <configuration>
+        <option name="apiUrl" value="unix:///var/run/docker.sock" />
+        <option name="certificatesPath" />
+      </configuration>
+    </remote-server>
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/polybar/config b/system/.config/polybar/config
index 15853ea..a772d20 100644
--- a/system/.config/polybar/config
+++ b/system/.config/polybar/config
@@ -43,7 +43,7 @@ module-margin = 2
 
 modules-left = i3
 modules-center = 
-modules-right = update gmail battery volume backlight vpn wlan ethernet date power
+modules-right = update gmail battery battery2 volume backlight vpn wlan ethernet date power
 tray-position = none
 separator = |
 
@@ -172,6 +172,10 @@ animation-charging-framerate = 500
 interval = 5
 poll-interval = 5
 
+[module/battery2]
+battery = BAT0
+inherit = module/battery
+
 
 ##############################################################################
 # Volume indicator                                                           #
diff --git a/system/.local/bin/clean b/system/.local/bin/clean
new file mode 100755
index 0000000..c7badf6
--- /dev/null
+++ b/system/.local/bin/clean
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# 
+# SCRIPT NAME:
+# clean
+#
+# AUTHOR:
+# Severin Kaderli <severin@kaderli.dev>
+#
+# DESCRIPTION:
+# This script cleans the system.
+#
+# USAGE:
+# ./clean
+. utils
+
+print_section "Remove unneeded dependencies"
+yay -R $(yay -Qdtq)
+
+print_section "Clean yay cache"
+yay -Sc
+
+print_section "Clean docker"
+docker system prune
\ No newline at end of file
diff --git a/system/.local/bin/upgrade b/system/.local/bin/upgrade
index 1048bbb..f4625f3 100755
--- a/system/.local/bin/upgrade
+++ b/system/.local/bin/upgrade
@@ -23,5 +23,8 @@ npm update -g
 print_section "Update composer packages"
 composer global update
 
+print_section "Update ruby gems"
+gem update
+
 print_section "Update Rust components"
 rustup update
diff --git a/system/etc/gemrc b/system/etc/gemrc
new file mode 100644
index 0000000..f22daf0
--- /dev/null
+++ b/system/etc/gemrc
@@ -0,0 +1 @@
+gem: --no-user-install
\ No newline at end of file