diff --git a/bashplugins b/bashplugins
index c1e73e3..dfef186 100644
--- a/bashplugins
+++ b/bashplugins
@@ -7,9 +7,9 @@ gdf()
     local fancydiff='/usr/bin/diff-so-fancy'
     local githighlight='/usr/share/git/diff-highlight/diff-highlight'
     if [[ -x ${fancydiff} ]]; then
-        gdiff "$@" | ${fancydiff} | less --tabs=4 -RFX
+        gdiff "$@" | ${fancydiff} | less --tabs=4 -RSFX
     elif [[ -x ${githighlight} ]]; then
-        gdiff "$@" | ${githighlight} | less --tabs=4 -RFX
+        gdiff "$@" | ${githighlight} | less --tabs=4 -RSFX
     else
         gdiff "$@"
     fi
diff --git a/gxkb.cfg b/gxkb.cfg
index 82efc15..63519fb 100644
--- a/gxkb.cfg
+++ b/gxkb.cfg
@@ -1,5 +1,5 @@
 [xkb config]
-group_policy=2
+group_policy=1
 default_group=0
 never_modify_config=false
 model=pc105