diff --git a/usr/bin/jghistory-pipe b/usr/bin/jghistory-pipe
index 3e6ec6f..9249672 100755
--- a/usr/bin/jghistory-pipe
+++ b/usr/bin/jghistory-pipe
@@ -23,7 +23,7 @@ trap "rm -f $MENU_ITEMS" EXIT
 
 
 if [ -f ~/.bash_history ]; then
-echo "@search,,10,5,292,20,4,left,top,auto,#262626,\"\"\"<big></big> <i>$TYPE_TO_SEARCH</i>\"\"\"" >/tmp/history_list.csv
+echo "@search,,10,5,292,20,4,left,top,auto,#262626,\"\"\"<big></big> <i>$TYPE_TO_SEARCH</i>\"\"\"" >/tmp/history_list.csv
 
 echo "^sep($HISTHELPER)" >>/tmp/history_list.csv
 while read -r line ; do
@@ -35,7 +35,7 @@ echo "\"\"\"$NOTHING\"\"\",exo-open --launch TerminalEmulator" >>/tmp/history_li
 fi
 ### RUN
 if [ $1 == "-s" ]; then
-. /usr/share/mb-jgtools/pipemenu-standalone.cfg
+. /usr/share/mb-jgtools/jgtools.inc
 
 MENU_PADDING_TOP=24
 MENU_HALIGN="center"
diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger
index c45769a..df21a62 100755
--- a/usr/bin/jgwallpaperchanger
+++ b/usr/bin/jgwallpaperchanger
@@ -353,22 +353,28 @@ if ! pgrep -f "mbwallpaper -s" > /dev/null; then
     out2+=("^tag(favwp)")
     out2+=("^sep($_FAVORITES_WP)")
     if [[ "$wallpap" != "/usr/share/backgrounds/marek-piwnicki-FgagFhxW4Sc-unsplash.jpg" ]]; then
-    out2+=("<big>󰦛</big>   $_DEFAULT_WP,nitrogen --set-scaled --save /usr/share/backgrounds/marek-piwnicki-FgagFhxW4Sc-unsplash.jpg;$me")
-    out2+=("^sep()")
-    
+    :
     else
     isfav=1
     fi
-    out2+=("<big></big>   $_RAND_FAV,jgwallpaperchanger randomfav;$me")
-    out2+=("^sep()")
     
     if [[ "${isfav}" != "1" ]];then
     out2+=("<span  fgcolor='red'><big>󱐮</big></span>   $_ADD_FAV,jgwallpaperchanger addfav ${wallpap};$me")
     out2+=("^sep()")
     fi
+    
+    out2+=("<big></big>   $_RAND_FAV,jgwallpaperchanger randomfav;$me")
+    out2+=("^sep()")
+    
+    
     out2+=("${favs[@]}")
     out2+=("^sep()")
     out2+=("<big></big>   $_EDIT_FAV,xdg-open $FAVWP")
+    if [[ "$wallpap" != "/usr/share/backgrounds/marek-piwnicki-FgagFhxW4Sc-unsplash.jpg" ]]; then
+    out2+=("^sep()")
+    out2+=("<big>󰦛</big>   $_DEFAULT_WP,nitrogen --set-scaled --save /usr/share/backgrounds/marek-piwnicki-FgagFhxW4Sc-unsplash.jpg;$me")
+    fi
+