diff --git a/src/settings/default.yml b/src/settings/default.yml
new file mode 100644
index 0000000..1652c21
--- /dev/null
+++ b/src/settings/default.yml
@@ -0,0 +1,51 @@
+dimensions:
+  x: 200
+  y: 200
+  z: 200
+temperature: 210
+bedTemperature: 70
+# heatBedTemperature: 20
+# heatTemperature: 20
+# heatupEnabled: true
+travelSpeed: 200.0
+layerHeight: 0.15
+heatedBed: false
+nozzleDiameter: 0.4
+filamentThickness: 2.85
+retraction:
+  amount: 3.0
+  enabled: true
+  speed: 50.0
+  minDistance: 0.0
+support:
+  acceptanceMargin: 1.5
+  distanceY: 0.4
+  enabled: false
+  gridSize: 6.0
+  margin: 2.0
+  plateSize: 4.0
+  flowRate: 0.8
+  speed: 40.0
+outerLine:
+  flowRate: 1.0
+  speed: 40.0
+innerLine:
+  flowRate: 1.0
+  speed: 50.0
+fill:
+  flowRate: 1.0
+  speed: 50.0
+  overlap: 0.0
+  gridSize: 5.0
+brim:
+  flowRate: 1.0
+  speed: 40.0
+  offset: 4.0
+top:
+  thickness: 0.8
+bottom:
+  flowRate: 1.2
+  speed: 40.0
+  thickness: 0.4
+shell:
+  thickness: 0.4
diff --git a/src/settings/material.yml b/src/settings/material.yml
new file mode 100644
index 0000000..5480598
--- /dev/null
+++ b/src/settings/material.yml
@@ -0,0 +1,6 @@
+pla:
+  title: PLA
+  temperature: 210
+abs:
+  title: ABS
+  temperature: 240
diff --git a/src/settings/printer.yml b/src/settings/printer.yml
new file mode 100644
index 0000000..71f44c4
--- /dev/null
+++ b/src/settings/printer.yml
@@ -0,0 +1,167 @@
+_3Dison_plus:
+  title: 3Dison plus
+  dimensions:
+    x: 227
+    y: 147
+    z: 150
+bigbuilder3d:
+  title: Big Builder 3D
+builder3d:
+  title: Builder 3D
+bukobot:
+  title: Bukobot
+cartesio:
+  title: Cartesio
+colido_2_0_plus:
+  title: ColiDo 2.0 Plus
+  heatedBed: true
+  dimensions:
+    x: 230
+    y: 150
+    z: 140
+colido_compact:
+  title: ColiDo Compact
+  dimensions:
+    x: 130
+    y: 130
+    z: 115
+colido_diy:
+  title: ColiDo DIY
+  dimensions:
+    z: 170
+colido_m2020:
+  title: ColiDo M2020
+  heatedBed: true
+colido_x3045:
+  title: ColiDo X3045
+  heatedBed: true
+  dimensions:
+    x: 300
+    y: 300
+    z: 450
+craftbot_plus:
+  title: CraftBot PLUS
+  heatedBed: true
+  filamentThickness: 1.75
+  dimensions:
+    x: 250
+cyrus:
+  title: Cyrus
+delta_rostockmax:
+  title: Delta RostockMax
+  dimensions:
+    x: 0
+    y: 0
+deltamaker:
+  title: Deltamaker
+  dimensions:
+    x: 0
+    y: 0
+doodle_dream:
+  title: Doodle Dream
+  filamentThickness: 1.75
+  dimensions:
+    x: 120
+    y: 120
+    z: 80
+eventorbot:
+  title: EventorBot
+felix:
+  title: Felix
+gigabot:
+  title: Gigabot
+kossel:
+  title: Kossel
+  dimensions:
+    x: 0
+    y: 0
+leapfrog_creatr:
+  title: LeapFrog Creatr
+lulzbot_aO_101:
+  title: LulzBot AO-101
+lulzbot_taz_4:
+  title: LulzBot TAZ 4
+  dimensions:
+    x: 298
+    y: 275
+    z: 250
+  heatedBed: true
+makerbot_generic:
+  title: Generic Makerbot Printer
+makerbot_replicator2:
+  title: MakerBot Replicator2
+makerbot_replicator2x:
+  title: MakerBot Replicator2x
+  heatedBed: true
+makerbot_thingomatic:
+  title: MakerBot Thing-o-matic
+makergear_m2:
+  title: MakerGear M2
+makergear_prusa:
+  title: MakerGear Prusa
+makibox:
+  title: Makibox
+mamba3d:
+  title: Mamba3D
+marlin_generic:
+  title: Generic Marlin Printer
+minifactory:
+  title: miniFactory
+  dimensions:
+    x: 150
+    y: 150
+    z: 155
+  heatedBed: true
+orca_0_3:
+  title: Orca 0.3
+ord_bot_hadron:
+  title: ORD Bot Hadron
+printrbot:
+  title: Printrbot
+printxel_3d:
+  title: Printxel 3D
+prusa_i3:
+  title: Prusa I3
+prusa_iteration_2:
+  title: Prusa Iteration 2
+rapman:
+  title: RapMan
+renkforce_rf100:
+  title: Renkforce RF10
+  filamentThickness: 1.75
+reprappro_huxley:
+  title: RepRapPro Huxley
+reprappro_mendel:
+  title: RepRapPro Mendel
+rigidbot:
+  title: Rigidbot
+robo_3d_printer:
+  title: RoBo 3D Printer
+shapercube:
+  title: ShaperCube
+tantillus:
+  title: Tantillus
+ultimaker:
+  title: Ultimaker
+ultimaker2:
+  title: Ultimaker 2
+  heatedBed: true
+ultimaker2go:
+  title: Ultimaker 2 Go
+  dimensions:
+    x: 120
+    y: 120
+    z: 112
+ultimaker_original_plus:
+  title: Ultimaker Original Plus
+  heatedBed: true
+vision_3d_printer:
+  title: Vision 3D Printer
+wanhao_duplicator4:
+  title: Wanhao Duplicator 4
+  filamentThickness: 1.75
+  heatedBed: true
+  dimensions:
+    x: 210
+    y: 140
+    z: 140
diff --git a/src/settings/printer_settings.json b/src/settings/printer_settings.json
deleted file mode 100644
index d4e4582..0000000
--- a/src/settings/printer_settings.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "ultimaker": {
-    "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": {
-    "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,
-    "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",
-    "type": "ultimaker2"
-  },
-  "ultimaker2go": {
-    "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,
-    "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",
-    "type": "ultimaker2g0"
-  }
-}
diff --git a/src/settings/quality.yml b/src/settings/quality.yml
new file mode 100644
index 0000000..9a823c6
--- /dev/null
+++ b/src/settings/quality.yml
@@ -0,0 +1,6 @@
+low:
+  layerHeight: .2
+medium:
+  layerHeight: .15
+height:
+  layerHeight: .1
diff --git a/src/settings/user_settings.json b/src/settings/user_settings.json
deleted file mode 100644
index d8c9140..0000000
--- a/src/settings/user_settings.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-	"low": {
-		"temperature": 210.0,
-		"bedTemperature": 70,
-		"heatBedTemperature": 20,
-		"heatTemperature": 20,
-		"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,
-			"speed": 40.0
-		},
-		"innerLine": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"fill": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"brim": {
-			"flowRate": 1.0,
-			"speed": 40.0
-		},
-		"support": {
-			"flowRate": 0.8,
-			"speed": 40.0
-		},
-		"bottom": {
-			"flowRate": 1.2,
-			"speed": 40.0
-		}
-	},
-	"medium": {
-		"temperature": 210.0,
-		"bedTemperature": 70,
-		"heatBedTemperature": 20,
-		"heatTemperature": 20,
-		"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,
-			"speed": 40.0
-		},
-		"innerLine": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"fill": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"brim": {
-			"flowRate": 1.0,
-			"speed": 40.0
-		},
-		"support": {
-			"flowRate": 0.8,
-			"speed": 40.0
-		},
-		"bottom": {
-			"flowRate": 1.2,
-			"speed": 40.0
-		}
-	},
-	"high": {
-		"temperature": 210.0,
-		"bedTemperature": 70,
-		"heatBedTemperature": 20,
-		"heatTemperature": 20,
-		"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,
-			"speed": 40.0
-		},
-		"innerLine": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"fill": {
-			"flowRate": 1.0,
-			"speed": 50.0
-		},
-		"brim": {
-			"flowRate": 1.0,
-			"speed": 40.0
-		},
-		"support": {
-			"flowRate": 0.8,
-			"speed": 40.0
-		},
-		"bottom": {
-			"flowRate": 1.2,
-			"speed": 40.0
-		}
-	}
-}