diff --git a/src/settings/printer_settings.json b/src/settings/printer_settings.json
index 2fe6e21..f1e3fc6 100644
--- a/src/settings/printer_settings.json
+++ b/src/settings/printer_settings.json
@@ -1,50 +1,38 @@
 {
 	"ultimaker": {
-		"baudrate": "115200", 
-		"dimensionsX": 200, 
-		"dimensionsY": 200, 
-		"dimensionsZ": 200, 
-		"endCode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)\n", 
-		"filamentThickness": 2.85, 
-		"heatedBed": false, 
-		"heatupBedTemperature": 70, 
-		"heatupEnabled": true, 
-		"heatupTemperature": 180, 
-		"nozzleDiameter": 0.4, 
-		"startCode": ";Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n", 
-		"temperature": 210.0, 
+		"dimensionsX": 200,
+		"dimensionsY": 200,
+		"dimensionsZ": 200,
+		"endCode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)\n",
+		"filamentThickness": 2.85,
+		"heatedBed": false,
+		"heatupEnabled": true,
+		"nozzleDiameter": 0.4,
+		"startCode": ";Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n",
 		"type": "ultimaker"
-	}, 
+	},
 	"ultimaker2": {
-		"baudrate": "115200", 
-		"dimensionsX": 223, 
-		"dimensionsY": 223, 
-		"dimensionsZ": 205, 
+		"dimensionsX": 223,
+		"dimensionsY": 223,
+		"dimensionsZ": 205,
 		"endCode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)\n",
-		"filamentThickness": 2.85, 
-		"heatedBed": true, 
-		"heatupBedTemperature": 70, 
-		"heatupEnabled": true, 
-		"heatupTemperature": 180, 
-		"nozzleDiameter": 0.4, 
+		"filamentThickness": 2.85,
+		"heatedBed": true,
+		"heatupEnabled": true,
+		"nozzleDiameter": 0.4,
 		"startCode": ";Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG0 X0 Y0 F{travelSpeed} ;home position is not X0 Y0\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n",
-		"temperature": 210.0, 
 		"type": "ultimaker2"
-	}, 
+	},
 	"ultimaker2go": {
-		"baudrate": "115200", 
-		"dimensionsX": 120, 
-		"dimensionsY": 120, 
-		"dimensionsZ": 115, 
+		"dimensionsX": 120,
+		"dimensionsY": 120,
+		"dimensionsZ": 115,
 		"endCode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)\n",
-		"filamentThickness": 2.85, 
-		"heatedBed": false, 
-		"heatupBedTemperature": 70, 
-		"heatupEnabled": true, 
-		"heatupTemperature": 20, 
-		"nozzleDiameter": 0.4, 
+		"filamentThickness": 2.85,
+		"heatedBed": false,
+		"heatupEnabled": true,
+		"nozzleDiameter": 0.4,
 		"startCode": ";Generated with Doodle3D (ultimaker2go)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG0 X0 Y0 F{travelSpeed} ;home position is not X0 Y0\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n",
-		"temperature": 210.0, 
 		"type": "ultimaker2g0"
 	}
-}
\ No newline at end of file
+}
diff --git a/src/settings/user_settings.json b/src/settings/user_settings.json
index a54e536..125341b 100644
--- a/src/settings/user_settings.json
+++ b/src/settings/user_settings.json
@@ -1,44 +1,47 @@
 {
-	"layerHeight": 0.15, 
-	"bottomThickness": 0.4, 
-	"topThickness": 0.8, 
-	"shellThickness": 0.4, 
-	"brimOffset": 4.0, 
-	"fillGridSize": 5.0, 
-	"infillOverlap": 0.0, 
-	"travelSpeed": 200.0, 
-	"retractionAmount": 3.0, 
-	"retractionEnabled": true, 
-	"retractionSpeed": 50.0, 
-	"retractionMinDistance": 0.0, 
-	"supportAcceptanceMargin": 1.5, 
-	"supportDistanceY": 0.4, 
-	"supportEnabled": false, 
-	"supportGridSize": 6.0, 
-	"supportMargin": 2.0,  
-	"supportPlateSize": 4.0, 
+	"heatupBedTemperature": 70,
+	"heatupTemperature": 20,
+	"temperature": 210.0,
+	"layerHeight": 0.15,
+	"bottomThickness": 0.4,
+	"topThickness": 0.8,
+	"shellThickness": 0.4,
+	"brimOffset": 4.0,
+	"fillGridSize": 5.0,
+	"infillOverlap": 0.0,
+	"travelSpeed": 200.0,
+	"retractionAmount": 3.0,
+	"retractionEnabled": true,
+	"retractionSpeed": 50.0,
+	"retractionMinDistance": 0.0,
+	"supportAcceptanceMargin": 1.5,
+	"supportDistanceY": 0.4,
+	"supportEnabled": false,
+	"supportGridSize": 6.0,
+	"supportMargin": 2.0,
+	"supportPlateSize": 4.0,
 	"outerLine": {
-		"flowRate": 1.0, 
+		"flowRate": 1.0,
 		"speed": 40.0
 	},
 	"innerLine": {
-		"flowRate": 1.0, 
+		"flowRate": 1.0,
 		"speed": 50.0
-	}, 
+	},
 	"fill": {
-		"flowRate": 1.0, 
+		"flowRate": 1.0,
 		"speed": 50.0
 	},
 	"brim": {
-		"flowRate": 1.0, 
+		"flowRate": 1.0,
 		"speed": 40.0
-	}, 
+	},
 	"support": {
-		"flowRate": 0.8, 
+		"flowRate": 0.8,
 		"speed": 40.0
-	}, 
+	},
 	"bottom": {
-		"flowRate": 1.2, 
+		"flowRate": 1.2,
 		"speed": 40.0
 	}
-}
\ No newline at end of file
+}