diff --git a/terminal_layout.sh b/terminal_layout.sh
index 3392c1f50107e0e91d13d80a7f4ef9b099c8a7a6..88ec5874cb38dabd22b95c2495cb52cd990ec3ce 100644
--- a/terminal_layout.sh
+++ b/terminal_layout.sh
@@ -36,8 +36,8 @@ function add_outline { file=$1
     if [ $? -eq 0 ]; then
       # begin outline section
       echo "    Found outline header, adding datas..."
-      echo $line    >> $TERMINAL_DIR/$file.tmp
-      cat $OUTLINES >> $TERMINAL_DIR/$file.tmp
+      echo "$line"    >> $TERMINAL_DIR/$file.tmp
+      cat  $OUTLINES >> $TERMINAL_DIR/$file.tmp
     else
       echo $line | grep -q -e "[ ][ ][ ][ ]spaceline:.*"
       if [ $? -eq 0 ]; then
@@ -46,7 +46,7 @@ function add_outline { file=$1
         echo $line | sed -f resize.sed >> $TERMINAL_DIR/$file.tmp
         rm -f resize.sed
       else
-        echo $line    >> $TERMINAL_DIR/$file.tmp
+        echo "$line"    >> $TERMINAL_DIR/$file.tmp
       fi
     fi
   done < $NORMAL_DIR/$file
@@ -67,16 +67,16 @@ function add_first_row { file=$1
       # begin views section
       echo "    Found views header, looking for individual layouts..."
       in_section_views=1
-      echo $line    >> $TERMINAL_DIR/$file.tmp1
+      echo "$line"    >> $TERMINAL_DIR/$file.tmp1
     else
       echo $line | grep -q -E "^[ ][ ][ ][ ][a-z]*:$"
       if [ $? -eq 0 ] && [ $in_section_views -eq 1 ]; then
         echo "      Found layout subsection ($line), adding data..."
-        echo $line     >> $TERMINAL_DIR/$file.tmp1
-        cat $FIRST_ROW >> $TERMINAL_DIR/$file.tmp1
+        echo "$line"     >> $TERMINAL_DIR/$file.tmp1
+        cat $FIRST_ROW   >> $TERMINAL_DIR/$file.tmp1
       else
         # a normal line, just append it to the destination file
-        echo $line    >> $TERMINAL_DIR/$file.tmp1
+        echo "$line"    >> $TERMINAL_DIR/$file.tmp1
         echo $line | grep -q -E "^buttons:$"
         if [ $? -eq 0 ]; then
           in_section_views=0
@@ -99,11 +99,11 @@ function add_buttons { file=$1
     if [ $? -eq 0 ]; then
       # begin views section
       echo "    Found buttons header, adding datas..."
-      echo $line   >> $TERMINAL_DIR/$file.tmp1
-      cat $BUTTONS >> $TERMINAL_DIR/$file.tmp1
+      echo "$line"   >> $TERMINAL_DIR/$file.tmp1
+      cat $BUTTONS   >> $TERMINAL_DIR/$file.tmp1
     else
       # a normal line, just append it to the destination file
-      echo $line    >> $TERMINAL_DIR/$file.tmp1
+      echo "$line"  >> $TERMINAL_DIR/$file.tmp1
     fi
   done < $TERMINAL_DIR/$file