diff --git a/bin/mabox-langfiles b/bin/mabox-langfiles
index c1021ea..17ea4a9 100755
--- a/bin/mabox-langfiles
+++ b/bin/mabox-langfiles
@@ -1,19 +1,15 @@
 #!/bin/bash
 #
-#
+# Copy i18n files to ~ if available
+# Run only once invoked from openbox autostart
+LNG=${LANG:0:2}
 FILE="$HOME/.config/mabox/.lang"
 if [ ! -f "$FILE" ]; then
-    case $LANG in
-    pl*)
-        rsync -a /usr/share/mabox/lang/pl/ $HOME/
-        ;;
-    es*)
-        rsync -a /usr/share/mabox/lang/es/ $HOME/
-        ;;
-    *)
+    if [ -d "/usr/share/mabox/lang/$LNG" ]; then
+        rsync -a /usr/share/mabox/lang/$LNG/ $HOME/
+    else
         rsync -a /usr/share/mabox/lang/en/ $HOME/
-        ;;
-    esac
+    fi
 touch $HOME/.config/mabox/.lang
 fi
 
diff --git a/bin/mb-obthemes b/bin/mb-obthemes
index 20f2154..09ff165 100755
--- a/bin/mb-obthemes
+++ b/bin/mb-obthemes
@@ -4,7 +4,7 @@
 #
 # Written for BunsenLabs by damo <damo@bunsenlabs.org> October 2015
 #
-# Ported for Manjaro by napcok <napcok@gmail.com> March 2016
+# Ported for Manjaro/Mabox by napcok <napcok@gmail.com> March 2016
 #
 # Save options are for  Conky(s)
 #                       Tint2(s)
@@ -12,9 +12,6 @@
 #                       GTK theme
 #                       Background (uses Nitrogen or feh, depending which
 #                                   has the newer saved bg config file)
-#                       Alt Menu (dmenu)
-#                       Lightdm login gtk greeter
-#                       X configs (.bashrc, .Xresources)
 #                       Terminator config
 #
 # Paths are assumed to be BunsenLabs defaults
@@ -481,10 +478,7 @@ function copyConky(){
     if [[ $(pidof conky) ]];then
     mkdir -p "$CONFIGDIR/conky"
     rm "$CONFIGDIR/conky/*conkyrc"
-    pgrep -a conky | while read a b c conkyfile;do
-    cp $conkyfile "$CONFIGDIR/conky/"
-    done
-    
+    cp ~/.config/conky/*conkyrc "$CONFIGDIR/conky/"
     fi
 }