diff --git a/.config/i3/config b/.config/i3/config
index 31ea06b..395a331 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -6,6 +6,8 @@ set $mod Mod4
 # is used in the bar {} block below.
 font pango:monospace 8
 
+workspace_auto_back_and_forth yes
+
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 #font pango:DejaVu Sans Mono 8
@@ -35,7 +37,7 @@ bindsym Print exec --no-startup-id maim --select | xclip -selection clipboard -t
 # kill focused window
 bindsym $mod+c kill
 # lock with wallpaper
-bindsym $mod+l exec --no-startup-id loginctl lock-session
+bindsym $mod+Shift+l exec --no-startup-id loginctl lock-session
 
 #####################################
 # Application menu handled by rofi: #
@@ -65,10 +67,10 @@ bindsym $mod+a exec --no-startup-id rofi -show window \
 
 
 # change focus
-#bindsym $mod+h focus left
-#bindsym $mod+j focus down
-#bindsym $mod+k focus up
-#bindsym $mod+l focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -76,6 +78,9 @@ bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
+# switch between windows with alt tab
+bindsym Mod1+Tab focus next
+
 # move focused window
 #bindsym $mod+Shift+h move left
 #bindsym $mod+Shift+j move down
diff --git a/home-manager/firefox/config/browser-features.nix b/home-manager/firefox/config/browser-features.nix
index 47d2352..73aa787 100644
--- a/home-manager/firefox/config/browser-features.nix
+++ b/home-manager/firefox/config/browser-features.nix
@@ -28,6 +28,7 @@
   # Mozilla shield studies (https://wiki.mozilla.org/Firefox/Shield) is a feature
   # which allows mozilla to remotely install experimental addons.
   "app.normandy.enabled" = false;
+  "messaging-system.rsexperimentloader.enabled" = false;
   "app.normandy.api_url" = "";
   "app.shield.optoutstudies.enabled" = false;
   "extensions.shield-recipe-client.enabled" = false;
@@ -122,6 +123,7 @@
 
   # copied these from a blog 
   "browser.newtabpage.activity-stream.feeds.telemetry" = false;	
+  "browser.newtabpage.activity-stream.feeds.asrouterfeed" = false;
   "browser.newtabpage.activity-stream.telemetry" = false;	
   "browser.ping-centre.telemetry" = false;
   "devtools.onboarding.telemetry.logged" = false;