diff --git a/composer/.config/composer/composer.json b/composer/.config/composer/composer.json
index b4b4c88..d3e8498 100644
--- a/composer/.config/composer/composer.json
+++ b/composer/.config/composer/composer.json
@@ -2,14 +2,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "friendsofphp/php-cs-fixer": "^2.12",
-        "squizlabs/php_codesniffer": "^3.4",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpmd/phpmd": "^2.7",
-        "kubawerlos/composer-json-fixer": "^2.1",
-        "hirak/prestissimo": "^0.3",
-        "consolidation/cgr": "^2.0"
-    },
-    "require-dev": {
-        "phpstan/phpstan": "^0.11.12"
+        "phpstan/phpstan": "^0.12.94",
+        "squizlabs/php_codesniffer": "^3.4"
     }
 }
diff --git a/git/.gitconfig b/git/.gitconfig
index 4d6b483..689dad9 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -10,6 +10,7 @@
 	ctags = !.git/hooks/ctags
 [init]
 	templatedir = ~/.git_template
+	defaultBranch = master
 [log]
 	decorate = short
 [color]
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index d6452c0..69a2e57 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -390,15 +390,16 @@ mode $mode_system {
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-bindsym $mod+Pause mode $mode_system
+#bindsym $mod+Pause mode $mode_system
+bindsym $mod+Home mode $mode_system
 #bindsym XF86Sleep  exec --no-startup-id ~/.config/i3/scripts/exit_menu.sh suspend, mode "default"
 
 ############################
 ######## KEYBOARD ##########
 ############################
-exec --no-startup-id xmodmap /home/xellos/.Xmodmap &
+#exec --no-startup-id xmodmap /home/xellos/.Xmodmap &
 
-bindsym mod3+Tab exec --no-startup-id xdotool key Caps_Lock
+#bindsym mod3+Tab exec --no-startup-id xdotool key Caps_Lock
 
 bindsym mod3+Escape exec --no-startup-id ~/.config/i3/scripts/exit_menu.sh poweroff
 
@@ -412,13 +413,13 @@ exec --no-startup-id nm-applet &
 exec --no-startup-id package-update-indicator &
 exec --no-startup-id xfsettingsd --sm-client-disable &
 exec --no-startup-id xfce4-power-manager &
-#exec --no-startup-id compton &
+exec --no-startup-id picom &
 exec --no-startup-id light-locker &
 exec --no-startup-id nitrogen --restore &
 
 #-> Session AutoStart
 exec --no-startup-id ~/.config/i3/scripts/autostart.sh
-#exec --no-startup-id parcellite &
+exec --no-startup-id parcellite &
 #exec --no-startup-id blueman-applet &
 #exec --no-startup-id redshift-gtk &
 #exec --no-startup-id indicator-kdeconnect &
diff --git a/i3/.config/i3/i3blocks.conf b/i3/.config/i3/i3blocks.conf
index 30a7a74..92b05bd 100644
--- a/i3/.config/i3/i3blocks.conf
+++ b/i3/.config/i3/i3blocks.conf
@@ -126,7 +126,7 @@ interval=30
 #
 [time]
 #color=#FFCCCC
-label=
+label= 
 command=date '+%Y-%m-%d %H:%M:%S'
 #command=date '+%H:%M '
 interval=1
diff --git a/i3/.config/i3/scripts/autostart.sh b/i3/.config/i3/scripts/autostart.sh
index 2bfd9ae..d0ccccf 100755
--- a/i3/.config/i3/scripts/autostart.sh
+++ b/i3/.config/i3/scripts/autostart.sh
@@ -2,3 +2,5 @@
 grep -rh Exec ~/.config/autostart | while read -r line ; do 
    ${line:5} &
 done
+# Fix snap
+xhost +si:localuser:$USER
diff --git a/i3/.config/i3/scripts/exit_menu.sh b/i3/.config/i3/scripts/exit_menu.sh
index 48aa512..2309df5 100755
--- a/i3/.config/i3/scripts/exit_menu.sh
+++ b/i3/.config/i3/scripts/exit_menu.sh
@@ -1,4 +1,4 @@
-#!/bin/dash
+#!/bin/sh
 
 case "$1" in
         lock)
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index c308897..eec6691 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -72,7 +72,7 @@ cursor_blink_interval     0.5
 cursor_stop_blinking_after 15.0
 
 # Number of lines of history to keep in memory for scrolling back
-scrollback_lines 2000
+scrollback_lines 31337
 
 # Program with which to view scrollback in a new window. The scrollback buffer is passed as
 # STDIN to this program. If you change it, make sure the program you use can
diff --git a/picom/picom.conf b/picom/picom.conf
new file mode 100644
index 0000000..fc55096
--- /dev/null
+++ b/picom/picom.conf
@@ -0,0 +1,232 @@
+#################################
+#
+# Documentation on the various options used here can be found at:
+#    https://github.com/yshui/picom/blob/next/man/picom.1.asciidoc
+#
+#################################
+
+
+#################################
+#
+# Backend
+#
+#################################
+
+# Backend to use: "xrender" or "glx".
+# GLX backend is typically much faster but depends on a sane driver.
+backend = "glx";
+
+#################################
+#
+# GLX backend
+#
+#################################
+
+# GLX backend: Copy unmodified regions from front buffer instead of redrawing
+# them all.  My tests with nvidia-drivers show a 10% decrease in performance
+# when the whole screen is modified, but a 20% increase when only 1/4 is.  My
+# tests on nouveau show terrible slowdown.
+# glx-copy-from-front = false;
+
+# GLX backend: Use MESA_copy_sub_buffer to do partial screen update.  My tests
+# on nouveau shows a 200% performance boost when only 1/4 of the screen is
+# updated.  May break VSync and is not available on some drivers.  Overrides
+# --glx-copy-from-front.
+glx-use-copysubbuffermesa = true;
+
+# GLX backend: Avoid rebinding pixmap on window damage.  Probably could improve
+# performance on rapid window content changes, but is known to break things on
+# some drivers (LLVMpipe).  Recommended if it works.
+glx-no-rebind-pixmap = true;
+
+# GLX backend: GLX buffer swap method we assume.
+use-damage = true
+
+glx-no-stencil = true;
+
+#################################
+#
+# Other
+#
+#################################
+
+# Specify refresh rate of the screen.
+# If not specified or 0, compton will try detecting this with X RandR extension.
+refresh-rate = 120;
+
+# Set VSync method.
+vsync = true;
+
+# Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate
+# tearing.  Reported to have no effect, though.
+dbe = true;
+
+# Limit compton to repaint at most once every 1 / refresh_rate second to boost
+# performance.  This should not be used with --vsync drm/opengl/opengl-oml as
+# they essentially does --sw-opti's job already, unless you wish to specify a
+# lower refresh rate than the actual value.
+sw-opti = false;
+
+# Unredirect all windows if a full-screen opaque window is detected, to maximize
+# performance for full-screen windows, like games.  Known to cause flickering
+# when redirecting/unredirecting windows.  paint-on-overlay may make the
+# flickering less obvious.
+unredir-if-possible = true;
+# unredir-if-possible-delay = 0;
+
+# Use WM_TRANSIENT_FOR to group windows, and consider windows in the same group
+# focused at the same time.
+detect-transient = true;
+
+# Use WM_CLIENT_LEADER to group windows, and consider windows in the same group
+# focused at the same time.  WM_TRANSIENT_FOR has higher priority if
+# --detect-transient is enabled, too.
+detect-client-leader = true;
+
+# Try to detect WM windows and mark them as active.
+mark-wmwin-focused = true;
+
+# Mark all non-WM but override-redirect windows active (e.g. menus).
+mark-ovredir-focused = true;
+
+# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused instead of
+# using FocusIn/Out events.  Usually more reliable but depends on a
+# EWMH-compliant WM.
+use-ewmh-active-win = true;
+
+# Detect rounded corners and treat them as rectangular when
+# --shadow-ignore-shaped is on.
+detect-rounded-corners = true;
+
+# Detect _NET_WM_OPACITY on client windows, useful for window managers not
+# passing _NET_WM_OPACITY of client windows to frame windows.  This prevents
+# opacity being ignored for some apps.  For example without this enabled my
+# xfce4-notifyd is 100% opacity no matter what.
+detect-client-opacity = true;
+
+invert-color-include = [ ];
+focus-exclude = [
+	"_NET_WM_NAME@:s = 'rofi'",
+	"_NET_WM_NAME@:s = 'dmenu'"
+];
+
+#################################
+#
+# Shadows
+#
+#################################
+
+# Enabled client-side shadows on windows.
+shadow = false;
+# The blur radius for shadows. (default 12)
+#shadow-radius = 10;
+# The left offset for shadows. (default -15)
+#shadow-offset-x = -5;
+# The top offset for shadows. (default -15)
+#shadow-offset-y = 0;
+# The translucency for shadows. (default .75)
+#shadow-opacity = 0.8;
+
+# Set if you want different colour shadows
+#shadow-red = 0.11;
+#shadow-green = 0.12;
+#shadow-blue = 0.13;
+
+# The shadow exclude options are helpful if you have shadows enabled. Due to the
+# way compton draws its shadows, certain applications will have visual glitches
+# (most applications are fine, only apps that do weird things with xshapes or
+# argb are affected).  This list includes all the affected apps I found in my
+# testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this
+# prevents a visual glitch with the XFWM alt tab switcher.
+#shadow-exclude = [
+#  "name = 'Notification'",
+# disable shadows for hidden windows:
+#  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
+#  "_GTK_FRAME_EXTENTS@:c",
+# disables shadows on sticky windows:
+#  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'",
+# disables shadows on frames:
+#  "class_g ?= 'i3-frame'",
+# disable shadows on floating windows:
+#  "!I3_FLOATING_WINDOW@:c"
+#];
+# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
+#shadow-ignore-shaped = false;
+
+#################################
+#
+# Opacity
+#
+#################################
+
+# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
+inactive-opacity = 1;
+# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
+active-opacity = 1;
+# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
+frame-opacity = 1;
+# Let inactive opacity set by -i override the _NET_WM_OPACITY values of windows.
+inactive-opacity-override = false;
+# Dim inactive windows. (0.0 - 1.0)
+inactive-dim = 0.06;
+# Use fixed inactive dim value, instead of adjusting according to window opacity.
+inactive-dim-fixed = true;
+opacity-rule = [
+	# "99:class_g = '*'",
+	# make all hidden windows completely transparent
+	"0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+];
+
+# Blur background of transparent windows. Bad performance with X Render backend.
+# GLX backend is preferred.
+# blur-background = false;
+# Blur background of opaque windows with transparent frames as well.
+# blur-background-frame = true;
+# blur-kern = "7x7box";
+# Do not let blur radius adjust based on window opacity.
+# blur-background-fixed = false;
+# blur-background-frame = false;
+# blur-background-exclude = [
+#  "class_g = 'i3-frame'",
+#  "window_type = 'dock'",
+#  "window_type = 'desktop'",
+#  "_GTK_FRAME_EXTENTS@:c"
+# ];
+
+#################################
+#
+# Fading
+#
+#################################
+
+# Fade windows during opacity changes.
+fading = false;
+
+# The time between steps in a fade in milliseconds. (default 10).
+# fade-delta = 7;
+# Opacity change between steps while fading in. (default 0.028).
+# fade-in-step = 0.05;
+# Opacity change between steps while fading out. (default 0.03).
+# fade-out-step = 0.05;
+# Prevent fading of windows in/out when opening/closing
+# no-fading-openclose = true;
+# Specify a list of conditions of windows that should not be faded.
+# fade-exclude = [ ];
+
+
+#################################
+#
+# Window type settings
+#
+#################################
+
+# Window type settings
+wintypes:
+{
+	tooltip = { fade = true; shadow = false; opacity = 1.0; focus = true; full-shadow = false; };
+	dock = { shadow = false; };
+	dnd = { shadow = false; };
+	utility =  { shadow = false; };
+	dropdown_menu = { shadow = false; };
+	popup_menu =  { shadow = false; };
+};
diff --git a/shell/.zsh_aliases b/shell/.zsh_aliases
index 411b2bf..da4b19f 100644
--- a/shell/.zsh_aliases
+++ b/shell/.zsh_aliases
@@ -36,4 +36,4 @@ alias pkgrm='sudo aptitude remove'
 alias wttr='curl http://wttr.in/Porto,Portugal'
 alias top='htop'
 alias bat='batcat'
-alias cat='bat --paging=never'
+alias cat='batcat --paging=never'
diff --git a/xorg-server/.Xresources b/xorg-server/.Xresources
index 2c2018a..26e9606 100644
--- a/xorg-server/.Xresources
+++ b/xorg-server/.Xresources
@@ -17,3 +17,9 @@
 *background: #191c26
 *foreground: #d0cec3
 *cursorColor: #fdc253
+Xft.antialias: 1
+Xft.hinting: 1
+Xft.hintstyle: hintfull
+Xft.rgba: rgb
+Xcursor.theme: LHackneyed
+Xcursor.size: 32
diff --git a/xorg-server/.xinitrc b/xorg-server/.xinitrc
old mode 100644
new mode 100755