diff --git a/wg_stop b/wg_stop
index b19100d..ce33cdb 100755
--- a/wg_stop
+++ b/wg_stop
@@ -17,7 +17,7 @@
       nmcli connection down $wert &> ${wg_wdir}.stop.txt 
       if disable=$(grep -i 'deaktiviert\|disabled' ${wg_wdir}.stop.txt)
           then   
-              notify-send --icon=${wg_pic}wg-stop.png "$wert Connection disconnected."
+              notify-send --icon=${wg_pic}wg-stop.png $"$wert Connection disconnected."
               pkill yad
        
       fi
diff --git a/wire_g b/wire_g
index c53c6a7..de81580 100755
--- a/wire_g
+++ b/wire_g
@@ -43,7 +43,7 @@ wg_notify(){
     #Icon des Menübuttons definieren
     echo "icon:${wg_pic}wg-vpn.png" >&3
     #Name des Menüs definieren
-    echo "tooltip:$active activ" >&3
+    echo $"tooltip:$active activ" >&3
 
 }
 export -f wg_notify
@@ -58,10 +58,10 @@ import_wg(){
     wg_pic="/home/$a_user/.icons/"
     wg_wdir="/home/$a_user/.config/wg_nmcli/"
     if wgconf=$(yad --file --separator=" \n" \
-                 --button="OK" --button="Cancel" \
+                 --button=$"OK" --button=$"Cancel" \
                  --width=1200 --height=800 \
                  --window-icon=${wg_pic}wg-import.png \
-                 --title="Wireguard .conf Select file")
+                 --title=$"Wireguard .conf Select file")
         then
             active=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/  .*//')
             if [[ -n $active ]]
@@ -92,9 +92,9 @@ remove(){
     if selection=$(yad --no-click --list --height=300 --width=60 \
                     --title="Wire-G Trash" --center \
                     --fixed --buttons-layout=center \
-                    --button="OK" --button="Cancel" \
+                    --button=$"OK" --button=$"Cancel" \
                     --separator="" --window-icon=${wg_pic}wg-trash.png \
-                    --borders=8 --column 'Delete' $tunnel)
+                    --borders=8 --column=$'Delete' $tunnel)
         then
             nmcli connection delete $selection &> ${wg_wdir}.tmp.txt 
             success=$(grep -i 'erfolgreich gelöscht\|successfully deleted' ${wg_wdir}.tmp.txt)
@@ -102,14 +102,14 @@ remove(){
                 then
                     yad --window-icon=${wg_pic}wg-trash.png \
                         --image-on-top --image=${wg_pic}wg-info.png \
-                        --text="Your tunnel $selection was successfully deleted.\n" \
-                        --text-align=center --button="OK" --title "Wire-G Trash" \
+                        --text=$"Your tunnel $selection was successfully deleted.\n" \
+                        --text-align=center --button=$"OK" --title "Wire-G Trash" \
                         --fixed --center --buttons-layout=center --borders=8 --center
             else 
                     yad --window-icon=${wg_pic}wg-trash.png \
                         --image-on-top --image=${wg_pic}wg-info.png \
-                        --text="Oh something went wrong.\nPlease delete tunnel in the network manager." \
-                        --text-align=center --button="OK" --title "Wire-G Trash" \
+                        --text=$"Oh something went wrong.\nPlease delete tunnel in the network manager." \
+                        --text-align=center --button=$"OK" --title "Wire-G Trash" \
                         --fixed --center --buttons-layout=center --borders=8 --center 
             fi 
             if [ $selection = $active ]
@@ -131,8 +131,8 @@ up_or_down(){
     if [[ -z $active ]]
         then
             yad --image-on-top --image=${wg_pic}wg-info.png \
-                --text="There is no active tunnel that you could stop.\n" \
-                --text-align=center --button="OK" --title "Wire-G" \
+                --text=$"There is no active tunnel that you could stop.\n" \
+                --text-align=center --button=$"OK" --title "Wire-G" \
                 --fixed --center --buttons-layout=center --borders=8 --center
     else
             wg_stop
@@ -149,7 +149,7 @@ more(){
     a_user=$(whoami)
     wg_pic="/home/$a_user/.icons/"
 
-    selection=$(yad --text "<span color='#626ff1'><b>Wire-G Author: Désiré Werner Menrath</b></span> 
+    selection=$(yad --text=$"<span color='#626ff1'><b>Wire-G Author: Désiré Werner Menrath</b></span> 
 <span color='#626ff1'><b>E-Mail: polunga40@unity-mail.de</b></span> 
 <span color='#626ff1'><b>At all tunnels, the auto start is disabled"!"</b></span> 
 <span color='#626ff1'><b>Use without warranty"!"</b></span>
@@ -158,9 +158,9 @@ more(){
                     --title="Wire-G" --center \
                     --fixed --borders=8 --close-on-unfocus \
                     --buttons-layout=center \
-                    --button=Import:"bash -c import_wg" \
-                    --button="Wire-G Stop":"bash -c up_or_down" \
-                    --button="Cancel":1 \
+                    --button=$"Import":"bash -c import_wg" \
+                    --button=$"Wire-G Stop":"bash -c up_or_down" \
+                    --button=$"Cancel":1 \
                     --separator="" --window-icon=${wg_pic}wg-vpn.png)
 }
 export -f more
@@ -187,15 +187,15 @@ if selection=$(yad --no-click --list \
                 --close-on-unfocus --center \
                 --height=300 --width=60 --title="Wire-G" \
                 --fixed --buttons-layout=center \
-                --button="OK" --button="Cancel" \
-                --button=More:"bash -c more" --button=Remove:"bash -c remove" --separator="" \
+                --button=$"OK" --button=$"Cancel" \
+                --button=$"More":"bash -c more" --button=$"Remove":"bash -c remove" --separator="" \
                 --window-icon=${wg_pic}wg-vpn.png \
                 --borders=8 --image-on-top --image=${wg_pic}wg-active.png \
-                --text "<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$active</b></span> 
+                --text=$"<b>Activ Tunnel: </b> <span color='#0fad0a'><b>$active</b></span> 
 <b>----------------------------------------------------------------------------------</b>  
 <b>If no tunnels are listed,</b> 
 <b>so they have to import their tunnel beforehand.</b>" \
-                --column 'Selection' $tunnel)   
+                --column=$'Selection' $tunnel)   
     then 
 
         if [[ -n $active ]]