merge with master

.config/i3/config

@@ -12,8 +12,9 @@
 set_from_resource $main_color i3wm.color1 #fdff00
 set_from_resource $secondary_color i3wm.color0 #98d1ce
 set_from_resource $bg_color i3wm.color4 #0c1014
-set $output_main DP-0
-set $output_secondary DVI-D-0
+set $output_main DP-0.1
+set $output_secondary DP-0.3
+set $refresh_i3status killall -SIGUSR1 i3status-rs
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
@@ -246,8 +247,6 @@ client.focused          $main_color $main_color $bg_color #2e9ef4
 client.focused_inactive $main_color $bg_color $main_color #2e9ef4
 client.unfocused        $bg_color $bg_color $main_color #2e9ef4
 
-focus_on_window_activation focus
-
 for_window [instance="fontpreview"] floating enable
 for_window [class="^Chrome$" title=" - Chromium$"] border none
 for_window [class="firefox"] border none
@@ -259,8 +258,11 @@ assign [class="com-mathworks-util-PostVMInit" title="^Fig"] $ws10
 new_window pixel 1
 new_float pixel 3
 hide_edge_borders smart
+#focus_on_window_activation focus
 focus_on_window_activation urgent
 
 workspace_auto_back_and_forth yes
 
 popup_during_fullscreen smart
+
+focus_wrapping false