diff --git a/jm-bm.sh b/jm-bm.sh
index 30fc320..ee37db3 100644
--- a/jm-bm.sh
+++ b/jm-bm.sh
@@ -28,38 +28,38 @@ echo '
 #--------------------------------------------------
 '
 #Watermark
-if [ ! -f $WTM2_PATH ]; then
-	cp images/watermark2.png $WTM2_PATH
+if [ ! -f "$WTM2_PATH" ]; then
+    cp images/watermark2.png "$WTM2_PATH"
 else
-	echo "watermark2 file exists, skipping copying..."
+    echo "watermark2 file exists, skipping copying..."
 fi
 #Favicon
-if [ ! -f $FICON_PATH ]; then
-	cp images/favicon2.ico $FICON_PATH
+if [ ! -f "$FICON_PATH" ]; then
+    cp images/favicon2.ico "$FICON_PATH"
 else
-	echo "favicon2 file exists, skipping copying..."
+    echo "favicon2 file exists, skipping copying..."
 fi
 #Local recording icon
-if [ ! -f $REC_ICON_PATH ];then
-	cp images/gnome_record.png $REC_ICON_PATH
+if [ ! -f "$REC_ICON_PATH" ];then
+    cp images/gnome_record.png "$REC_ICON_PATH"
 else
         echo "recodring icon exists, skipping copying..."
 fi
 
 #Custom / Remove icons
-sed -i "s|watermark.png|watermark2.png|g" $CSS_FILE
-sed -i "s|favicon.ico|favicon2.ico|g" $TITLE_FILE
-sed -i "s|jitsilogo.png|watermark2.png|g" $TITLE_FILE
-sed -i "s|logo-deep-linking.png|watermark2.png|g" $BUNDLE_JS
-sed -i "s|jitsiLogo_square.png|gnome_record.png|g" $BUNDLE_JS
+sed -i "s|watermark.png|watermark2.png|g" "$CSS_FILE"
+sed -i "s|favicon.ico|favicon2.ico|g" "$TITLE_FILE"
+sed -i "s|jitsilogo.png|watermark2.png|g" "$TITLE_FILE"
+sed -i "s|logo-deep-linking.png|watermark2.png|g" "$BUNDLE_JS"
+sed -i "s|jitsiLogo_square.png|gnome_record.png|g" "$BUNDLE_JS"
 #Disable logo and url
 if [ -z "$(grep -nr ".leftwatermark{display:none" "$CSS_FILE")" ]; then
-sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" $CSS_FILE
+sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE"
 fi
 
 #Customize room title
-sed -i "s|Jitsi Meet|$APP_NAME|g" $TITLE_FILE
-sed -i "s| powered by the Jitsi Videobridge||g" $TITLE_FILE
+sed -i "s|Jitsi Meet|$APP_NAME|g" "$TITLE_FILE"
+sed -i "s| powered by the Jitsi Videobridge||g" "$TITLE_FILE"
 sed -i "/appNotInstalled/ s|{{app}}|$MOVILE_APP_NAME|" /usr/share/jitsi-meet/lang/*
 
 #Custom UI changes
@@ -67,13 +67,13 @@ if [ -f "$INT_CONF_ETC" ]; then
     echo "Static interface_config.js exists, skipping modification..."
 else
     echo "This setup doesn't have a static interface_config.js, checking changes..."
-	echo -e "\nPlease note that brandless mode will also overwrite support links.\n"
-	sed -i "21,32 s|Jitsi Meet|$APP_NAME|g" $INT_CONF
-	sed -i  "s|\([[:space:]]\)APP_NAME:.*| APP_NAME: \'$APP_NAME\',|" $INT_CONF
-	sed -i "s|Fellow Jitster|$PART_USER|g" $INT_CONF
-	sed -i "s|'me'|'$LOCAL_USER'|" $INT_CONF
-	sed -i "s|LIVE_STREAMING_HELP_LINK: .*|LIVE_STREAMING_HELP_LINK: '#',|g" $INT_CONF
-	sed -i "s|SUPPORT_URL: .*|SUPPORT_URL: '#',|g" $INT_CONF
-	#Logo 2
-	sed -i "s|watermark.png|watermark2.png|g" $INT_CONF
+    echo -e "\nPlease note that brandless mode will also overwrite support links.\n"
+    sed -i "21,32 s|Jitsi Meet|$APP_NAME|g" "$INT_CONF"
+    sed -i  "s|\([[:space:]]\)APP_NAME:.*| APP_NAME: \'$APP_NAME\',|" "$INT_CONF"
+    sed -i "s|Fellow Jitster|$PART_USER|g" "$INT_CONF"
+    sed -i "s|'me'|'$LOCAL_USER'|" "$INT_CONF"
+    sed -i "s|LIVE_STREAMING_HELP_LINK: .*|LIVE_STREAMING_HELP_LINK: '#',|g" "$INT_CONF"
+    sed -i "s|SUPPORT_URL: .*|SUPPORT_URL: '#',|g" "$INT_CONF"
+    #Logo 2
+    sed -i "s|watermark.png|watermark2.png|g" "$INT_CONF"
 fi