diff --git a/Makefile b/Makefile
index 17081c7..efcedb7 100644
--- a/Makefile
+++ b/Makefile
@@ -20,14 +20,16 @@ fontconfig:
 
 srcfile: $(DESTDIR)/src/.srcfile
 
-st:
-	install -Dm600 st/config.def.h $(DESTDIR)/src/st/config.def.h
+st: $(DESTDIR)/src/st/config.h
 
 .PHONY: fish i3 i3status vis Xresources bspwm sxhkd fontconfig srcfile st
 
 
 ## Actual file operations
 
+$(DESTDIR)/src/st/config.h: $(PWD)/st/config.h
+	ln -sf $^ $@
+
 $(DESTDIR)$(PREFIX)/fish/config.fish: $(PWD)/fish/config.fish 
 	ln -sf $^ $@
 
diff --git a/i3/config b/i3/config
index bb1cf5c..f1f597f 100644
--- a/i3/config
+++ b/i3/config
@@ -181,7 +181,7 @@ bar {
 # MY OWN CONFIGS
 # 
 # Set root window color
-exec --no-startup-id xsetroot -solid "#333333"
+# exec --no-startup-id xsetroot -solid "#333333"
 
 # Set fehbg
 exec --no-startup-id ~/.fehbg
@@ -199,24 +199,24 @@ bindsym ctrl+$mod+b exec blue
 hide_edge_borders smart
 
 # Start redshift
-exec --no-startup-id redshift -t 6000:2000 -l 49.87167:8.65027
+# exec --no-startup-id redshift -t 6000:2000 -l 49.87167:8.65027
 
-exec --no-startup-id amixer set Master 0
+# exec --no-startup-id amixer set Master 0
 
 # Change volume
-bindsym XF86AudioRaiseVolume exec st -e pamix
-bindsym XF86AudioLowerVolume exec st -e pamix
-bindsym XF86AudioMute exec st -e pamix
+# bindsym XF86AudioRaiseVolume exec st -e pamix
+# bindsym XF86AudioLowerVolume exec st -e pamix
+# bindsym XF86AudioMute exec st -e pamix
 
 # Screenshot
-bindsym $mod+z exec scrot
+# bindsym $mod+z exec scrot
 
 # Keyboard layout
-exec --no-startup-id setxkbmap -layout de
+# exec --no-startup-id setxkbmap -layout de
 
 # DPI
-exec --no-startup-id xrandr --dpi 160
-exec --no-startup-id xrdb -merge ~/.Xresources
+# exec --no-startup-id xrandr --dpi 160
+# exec --no-startup-id xrdb -merge ~/.Xresources
 
 # Polybar
 # exec --no-startup-id $HOME/.config/polybar/launch.sh
diff --git a/st/config_hidpi.h b/st/config_hidpi.h
index 62f08d1..03f372e 100644
--- a/st/config_hidpi.h
+++ b/st/config_hidpi.h
@@ -30,9 +30,9 @@ static float chscale = 1.0;
 /*
  * word delimiter string
  *
- * More advanced example: L" `'\"()[]{}"
+ * More advanced example: " `'\"()[]{}"
  */
-wchar_t *worddelimiters = L" ";
+char *worddelimiters = " ";
 
 /* selection timeouts (in milliseconds) */
 static unsigned int doubleclicktimeout = 300;
@@ -150,22 +150,14 @@ static unsigned int mousebg = 0;
  */
 static unsigned int defaultattr = 11;
 
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
+	/* button               mask            string */
+	{ Button4,              XK_ANY_MOD,     "\031" },
+	{ Button5,              XK_ANY_MOD,     "\005" },
 };
 
 /* Internal keyboard shortcuts. */
@@ -203,6 +195,10 @@ static Shortcut shortcuts[] = {
  * * 0: no value
  * * > 0: cursor application mode enabled
  * * < 0: cursor application mode disabled
+ * crlf value
+ * * 0: no value
+ * * > 0: crlf mode is enabled
+ * * < 0: crlf mode is disabled
  *
  * Be careful with the order of the definitions because st searches in
  * this table sequentially, so any XK_ANY_MOD must be in the last
@@ -221,6 +217,13 @@ static KeySym mappedkeys[] = { -1 };
  */
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
+/*
+ * Override mouse-select while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forceselmod = ShiftMask;
+
 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.