diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index dd054ea..3671508 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -209,17 +209,17 @@ script#control-view-template(type="text/x-template")
 
     .macros-div(class="present")
        button.macros-buttons(title="Click to run Macros 1", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 1
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 1
        button.macros-buttons(title="Click to run Macros 2", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 2
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 2
        button.macros-buttons(title="Click to run Macros 3", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 3
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 3
        button.macros-buttons(title="Click to run Macros 4", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 4
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 4
        button.macros-buttons(title="Click to run Macros 5", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 5
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 5
        button.macros-buttons(title="Click to run Macros 6", @click="open",
-            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:4px") Macros 6
+            :disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 6
 
 
     .tabs
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 532e517..916b600 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -3,10 +3,10 @@ script#macros-template(type="text/x-template")
     h1 Macros Configuration
     .tabs
         input#tab1(type="radio", name="tabs",checked="" @click="tab = '1'")
-        label(for="tab1", title="Run GCode programs",style="height:50px;width:100px") Macros 1
+        label(for="tab1",style="height:50px;width:100px") Macros 1
 
         input#tab2(type="radio", name="tabs", @click="tab = '2'")
-        label(for="tab2", title="Manual GCode entry",style="height:50px;width:100px") Macros 2
+        label(for="tab2",style="height:50px;width:100px") Macros 2
 
         input#tab3(type="radio", name="tabs", @click="tab = '3'")
         label(for="tab3",style="height:50px;width:100px") Macros 3
@@ -14,10 +14,10 @@ script#macros-template(type="text/x-template")
         input#tab4(type="radio", name="tabs", @click="tab = '4'")
         label(for="tab4",style="height:50px;width:100px") Macros 4
 
-        input#tab4(type="radio", name="tabs", @click="tab = '5'")
+        input#tab5(type="radio", name="tabs", @click="tab = '5'")
         label(for="tab5",style="height:50px;width:100px") Macros 5
 
-        input#tab4(type="radio", name="tabs", @click="tab = '6'")
+        input#tab6(type="radio", name="tabs", @click="tab = '6'")
         label(for="tab6",style="height:50px;width:100px") Macros 6
 
         section#content1.tab-content
diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index d2fbeb7..79b6ff7 100644
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -588,17 +588,49 @@
     "type":"list",
     "index":"123456",
     "default":[
-      { "name":"Macros 1"},
-      { "name":"Macros 2"},
-      { "name":"Macros 3"},
-      { "name":"Macros 4"},
-      { "name":"Macros 5"},
-      { "name":"Macros 6"}
+      {
+         "name":"Macros 1",
+         "color": "",
+         "gcode": ""
+      },
+      {
+         "name":"Macros 2",
+         "color": "",
+         "gcode": ""
+      },
+      {
+         "name":"Macros 3",
+         "color": "",
+         "gcode": ""
+      },
+      {
+         "name":"Macros 4",
+         "color": "",
+         "gcode": ""
+      },
+      {
+         "name":"Macros 5",
+         "color": "",
+         "gcode": ""
+      },
+      {
+         "name":"Macros 6",
+         "color": "",
+         "gcode": ""
+      }
     ],
     "template": {
       "name": {
         "type": "text",
         "default": "Default Message"
+      },
+      "color": {
+        "type": "text",
+        "default": "Default Color"
+      },
+      "gcode": {
+        "type": "text",
+        "default": "Default G-Code"
       }
     }
   },