diff --git a/.gitignore b/.gitignore
index 779d87b..8857c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,21 @@ system/.config/cmus/*
 system/.config/polybar/scripts/gmail/credentials.json
 
 system/.config/i3/config
-system/.config/gtk-2.0/gtkfilechooser.ini
\ No newline at end of file
+system/.config/gtk-2.0/gtkfilechooser.ini
+
+# PhpStorm Configuration
+system/.config/phpstorm/config/port.lock
+system/.config/phpstorm/config/port
+system/.config/phpstorm/config/tasks
+system/.config/phpstorm/config/plugins
+system/.config/phpstorm/system
+system/.config/phpstorm/config/phpstorm.key
+system/.config/phpstorm/config/options/dimensions.xml
+system/.config/phpstorm/config/options/debugger.xml
+system/.config/phpstorm/config/options/images.support.xml
+system/.config/phpstorm/config/options/other.xml
+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
diff --git a/install b/install
index b97519f..ef49fa2 100755
--- a/install
+++ b/install
@@ -66,6 +66,7 @@ LINKED_FILES_HOME=(
     ".config/npm"
     ".config/octave"
     ".config/pacman"
+    ".config/phpstorm"
     ".config/polybar"
     ".config/python"
     ".config/redshift"
@@ -91,6 +92,7 @@ declare -A LINKED_FILES
 LINKED_FILES=(
     ["${HOME}/music"]="${HOME}/documents/Media/Music"
     ["${HOME}/pictures"]="${HOME}/documents/Media/Pictures"
+    ["${HOME}/.PhpStorm2019.1"]="${XDG_CONFIG_HOME}/phpstorm"
 )
 
 # Permissions to set for folders and files
@@ -109,6 +111,7 @@ ADD_GROUPS=(
 # Array of systemd services which should be enabled
 SYSTEMD_SERVICES=(
     "acpid"
+    "bluetooth"
     "cronie"
     "docker"
     "NetworkManager"
diff --git a/system/.config/git/config b/system/.config/git/config
index 402b8fc..f5ec5c7 100644
--- a/system/.config/git/config
+++ b/system/.config/git/config
@@ -51,7 +51,7 @@
 	editor = vim
 
 [push]
-	default = upstream
+	default = current
 
 [url "git@gitlab.com:severinkaderli/"]
 	insteadOf = gl:
diff --git a/system/.config/httpie/config.json b/system/.config/httpie/config.json
index eb50c8e..16d1801 100644
--- a/system/.config/httpie/config.json
+++ b/system/.config/httpie/config.json
@@ -1,8 +1,8 @@
 {
-  "__meta__": {
-    "about": "HTTPie configuration file",
-    "help": "https://httpie.org/doc#config",
-    "httpie": "1.0.2"
-  },
-  "default_options": []
+    "__meta__": {
+        "about": "HTTPie configuration file",
+        "help": "https://httpie.org/doc#config",
+        "httpie": "1.0.2"
+    },
+    "default_options": []
 }
diff --git a/system/.config/i3/config.base b/system/.config/i3/config.base
index 5d5787c..cb29fde 100644
--- a/system/.config/i3/config.base
+++ b/system/.config/i3/config.base
@@ -115,8 +115,8 @@ bindsym $mod+T split toggle
 # Fullscreen toggle
 bindsym $mod+F11 fullscreen toggle
 
-# toggle tiling / floating
-bindsym $mod+Shift+Space floating toggle
+# Toggle between floating / tilling mode
+bindsym $mod+S floating toggle
 
 # Workspace switching
 bindsym $mod+1 workspace $workspace1
diff --git a/system/.config/phpstorm/config/codestyles/Custom.xml b/system/.config/phpstorm/config/codestyles/Custom.xml
new file mode 100644
index 0000000..6e9cca1
--- /dev/null
+++ b/system/.config/phpstorm/config/codestyles/Custom.xml
@@ -0,0 +1,24 @@
+<code_scheme name="Custom" version="173">
+  <PHPCodeStyleSettings>
+    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+    <option name="LOWER_CASE_NULL_CONST" value="true" />
+    <option name="ELSE_IF_STYLE" value="COMBINE" />
+    <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+    <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+  </PHPCodeStyleSettings>
+  <codeStyleSettings language="PHP">
+    <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+    <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+  </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/codestyles/Default.xml b/system/.config/phpstorm/config/codestyles/Default.xml
new file mode 100644
index 0000000..e94f32a
--- /dev/null
+++ b/system/.config/phpstorm/config/codestyles/Default.xml
@@ -0,0 +1 @@
+<code_scheme name="Default" version="173" />
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/disabled_plugins.txt b/system/.config/phpstorm/config/disabled_plugins.txt
new file mode 100644
index 0000000..d43464f
--- /dev/null
+++ b/system/.config/phpstorm/config/disabled_plugins.txt
@@ -0,0 +1,2 @@
+com.intellij.CloudConfig
+org.jetbrains.settingsRepository
diff --git a/system/.config/phpstorm/config/fileTemplates/includes/PHP File Header.php b/system/.config/phpstorm/config/fileTemplates/includes/PHP File Header.php
new file mode 100644
index 0000000..aa12061
--- /dev/null
+++ b/system/.config/phpstorm/config/fileTemplates/includes/PHP File Header.php	
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) ${YEAR}, whatwedo GmbH
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/inspection/Custom.xml b/system/.config/phpstorm/config/inspection/Custom.xml
new file mode 100644
index 0000000..a900e97
--- /dev/null
+++ b/system/.config/phpstorm/config/inspection/Custom.xml
@@ -0,0 +1,8 @@
+<profile version="1.0">
+  <option name="myName" value="Custom" />
+  <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+    <option name="processCode" value="true" />
+    <option name="processLiterals" value="true" />
+    <option name="processComments" value="true" />
+  </inspection_tool>
+</profile>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/keymaps/Custom.xml b/system/.config/phpstorm/config/keymaps/Custom.xml
new file mode 100644
index 0000000..7b1760e
--- /dev/null
+++ b/system/.config/phpstorm/config/keymaps/Custom.xml
@@ -0,0 +1,22 @@
+<keymap version="1" name="Custom" parent="Default for XWin">
+  <action id="ActivateVersionControlToolWindow">
+    <keyboard-shortcut first-keystroke="shift ctrl g" />
+  </action>
+  <action id="ChangesView.GroupBy.Directory" />
+  <action id="CloseContent">
+    <keyboard-shortcut first-keystroke="ctrl w" />
+  </action>
+  <action id="EditorSelectWord" />
+  <action id="FileChooser.TogglePathShowing" />
+  <action id="GotoTest" />
+  <action id="Images.ShowThumbnails" />
+  <action id="ParameterInfo" />
+  <action id="ReopenClosedTab">
+    <keyboard-shortcut first-keystroke="shift ctrl t" />
+  </action>
+  <action id="RunDashboard.ShowConfigurations" />
+  <action id="SearchEverywhere">
+    <keyboard-shortcut first-keystroke="ctrl p" />
+  </action>
+  <action id="TodoViewGroupByShowPackages" />
+</keymap>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/code.style.schemes.xml b/system/.config/phpstorm/config/options/code.style.schemes.xml
new file mode 100644
index 0000000..a39271a
--- /dev/null
+++ b/system/.config/phpstorm/config/options/code.style.schemes.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Custom" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/colors.scheme.xml b/system/.config/phpstorm/config/options/colors.scheme.xml
new file mode 100644
index 0000000..39308cd
--- /dev/null
+++ b/system/.config/phpstorm/config/options/colors.scheme.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="EditorColorsManagerImpl">
+    <global_color_scheme name="Darcula" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/editor.codeinsight.xml b/system/.config/phpstorm/config/options/editor.codeinsight.xml
new file mode 100644
index 0000000..c8593ab
--- /dev/null
+++ b/system/.config/phpstorm/config/options/editor.codeinsight.xml
@@ -0,0 +1,3 @@
+<application>
+  <component name="DaemonCodeAnalyzerSettings" profile="Custom" />
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/editor.xml b/system/.config/phpstorm/config/options/editor.xml
new file mode 100644
index 0000000..021774e
--- /dev/null
+++ b/system/.config/phpstorm/config/options/editor.xml
@@ -0,0 +1,26 @@
+<application>
+  <component name="DefaultFont">
+    <option name="FONT_SIZE" value="14" />
+    <option name="FONT_FAMILY" value="Fira Mono" />
+  </component>
+  <component name="EditorSettings">
+    <option name="languageBreadcrumbsMap">
+      <map>
+        <entry key="CSS" value="true" />
+        <entry key="HTML" value="true" />
+        <entry key="Haml" value="true" />
+        <entry key="JSON" value="true" />
+        <entry key="JavaScript" value="true" />
+        <entry key="LESS" value="true" />
+        <entry key="PHP" value="true" />
+        <entry key="SASS" value="true" />
+        <entry key="SCSS" value="true" />
+        <entry key="TypeScript" value="true" />
+        <entry key="XHTML" value="true" />
+        <entry key="XML" value="true" />
+        <entry key="yaml" value="true" />
+      </map>
+    </option>
+    <option name="SHOW_BREADCRUMBS" value="false" />
+  </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
new file mode 100644
index 0000000..a4827a0
--- /dev/null
+++ b/system/.config/phpstorm/config/options/ide.general.xml
@@ -0,0 +1,6 @@
+<application>
+  <component name="GeneralSettings">
+    <option name="confirmExit" value="false" />
+    <option name="showTipsOnStartup" value="false" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/keymap.xml b/system/.config/phpstorm/config/options/keymap.xml
new file mode 100644
index 0000000..168209d
--- /dev/null
+++ b/system/.config/phpstorm/config/options/keymap.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="KeymapManager">
+    <active_keymap name="Custom" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/laf.xml b/system/.config/phpstorm/config/options/laf.xml
new file mode 100644
index 0000000..c1f98d9
--- /dev/null
+++ b/system/.config/phpstorm/config/options/laf.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="LafManager">
+    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/php.xml b/system/.config/phpstorm/config/options/php.xml
new file mode 100644
index 0000000..5a83f7b
--- /dev/null
+++ b/system/.config/phpstorm/config/options/php.xml
@@ -0,0 +1,8 @@
+<application>
+  <component name="MessDetector">
+    <phpmd_settings_migrated />
+  </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings_migrated />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/phpstorm/config/options/ui.lnf.xml b/system/.config/phpstorm/config/options/ui.lnf.xml
new file mode 100644
index 0000000..457ce15
--- /dev/null
+++ b/system/.config/phpstorm/config/options/ui.lnf.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="UISettings">
+    <option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/system/.config/vue/.vuerc b/system/.config/vue/.vuerc
index 4949eea..fa60727 100644
--- a/system/.config/vue/.vuerc
+++ b/system/.config/vue/.vuerc
@@ -17,5 +17,6 @@
       "routerHistoryMode": true,
       "cssPreprocessor": "sass"
     }
-  }
+  },
+  "packageManager": "npm"
 }
\ No newline at end of file