diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 0b67e3c..1bd1a14 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -13,6 +13,8 @@
 	NOTE that the all-caps definitions will be changed into configuration keys, or moved to a different location
 ]]--
 local printer = require('util.printer')
+local log = require('util.logger')
+local utils = require('util.utils')
 
 local M = {}
 
@@ -219,18 +221,30 @@ M.printer_enableTraveling = {
 	description = ''
 }
 
-M.printer_startgcode = {
+M.printer_startcode_marlin = {
 	default = ';Generated with Doodle3D\nM109 S{printingTemp} ;set target temperature \n;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)',
 	type = 'string',
 	description = ''
 }
 
-M.printer_endgcode = {
+M.printer_endcode_marlin = {
 	default = '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;M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
 	type = 'string',
 	description = ''
 }
 
+M.printer_startcode_x3g = {
+	default = '',
+	type = 'string',
+	description = ''
+}
+
+M.printer_endcode_x3g = {
+	default = '',
+	type = 'string',
+	description = ''
+}
+
 M.printer_maxObjectHeight = {
 	default = 150,
 	type = 'int',
diff --git a/src/util/printer.lua b/src/util/printer.lua
index 13f65a2..2c8fa43 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -33,7 +33,9 @@ local SUPPORTED_PRINTERS = {
 	robo_3d_printer = "RoBo 3D Printer",
 	shapercube = "ShaperCube",
 	tantillus = "Tantillus",
-	vision_3d_printer = "Vision 3D Printer"
+	vision_3d_printer = "Vision 3D Printer",
+	marlin_generic = "Generic Marlin Printer",
+    makerbot_generic = "Generic Makerbot Printer"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",