diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe
index bb840a8..20d560c 100755
--- a/usr/bin/jgmenusettings-pipe
+++ b/usr/bin/jgmenusettings-pipe
@@ -150,17 +150,22 @@ out+=("$CIRCLE,mb-setvar jgmenu_icon_theme=Numix-Circle;mb-setvar jgmenu_use_ico
########## THEMES
out+=("^sep($COLOR_SCHEME)")
-out+=("$CHOOSE,^checkout(motywy)")
+
+
if [ $jgmenu_theme != obtheme ]; then
+out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
+^sep()")
out+=("$EDIT_CURRENT: ($jgmenu_theme),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany")
else
ob_file=$HOME/.config/openbox/rc.xml
[[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")
-out+=("$EDIT_CURRENT: ($wm_theme),geany $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc,geany")
-fi
-out2+=("^tag(motywy)")
-out2+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
+out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings
^sep()")
+out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany")
+fi
+out+=("$CHOOSE,^checkout(motywy)")
+out2+=("^tag(motywy)")
+
for item in "$HOME"/.config/mabox/jgobthemes/*colorrc; do
theme="${item##*/}"
out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};mb-jgtools settings")