diff --git a/resources/definitions/tinyboy.def.json b/resources/definitions/tinyboy.def.json
deleted file mode 100644
index 968d24ff8f..0000000000
--- a/resources/definitions/tinyboy.def.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": 2,
-    "name": "TinyBoy",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "author": "Fred Chan",
-        "manufacturer": "TinyBoy / mago",
-        "category": "tinyboy",		
-        "visible": false,
-        "file_formats": "text/x-gcode",
-		"has_materials": false,
-        "has_machine_quality": true,
-        "preferred_quality_type": "normal",		
-    },
-	
-    "overrides": {
-        "machine_width": { "default_value": 100 },
-        "machine_depth": { "default_value": 100 },
-        "machine_height": { "default_value": 105 },
-        "machine_head_with_fans_polygon": { 
-            "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
-            ]
-        },
-        "machine_center_is_zero": { "default_value": false },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
-        "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
-        "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
-        "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors"
-        }
-    }
-}
diff --git a/resources/definitions/tinyboy_e10.def.json b/resources/definitions/tinyboy_e10.def.json
index 5c9c6d9eb4..dcb0c0c80f 100644
--- a/resources/definitions/tinyboy_e10.def.json
+++ b/resources/definitions/tinyboy_e10.def.json
@@ -7,6 +7,10 @@
         "author": "Fred Chan",
         "manufacturer": "TinyBoy / mago",
         "category": "tinyboy",		
+        "file_formats": "text/x-gcode",
+		"has_materials": false,
+        "has_machine_quality": true,
+        "preferred_quality_type": "normal",		
 		"machine_extruder_trains":
         {
             "0": "tinyboy_extruder_0"
diff --git a/resources/definitions/tinyboy_e16.def.json b/resources/definitions/tinyboy_e16.def.json
index df9b251c57..528dd1778f 100644
--- a/resources/definitions/tinyboy_e16.def.json
+++ b/resources/definitions/tinyboy_e16.def.json
@@ -7,6 +7,10 @@
         "author": "Fred Chan",
         "manufacturer": "TinyBoy / mago",
         "category": "tinyboy",				
+        "file_formats": "text/x-gcode",
+		"has_materials": false,
+        "has_machine_quality": true,
+        "preferred_quality_type": "normal",		
 		"machine_extruder_trains":
         {
             "0": "tinyboy_extruder_0"
diff --git a/resources/definitions/tinyboy_mago.def.json b/resources/definitions/tinyboy_mago.def.json
index 0ca3157da3..2f348771e4 100644
--- a/resources/definitions/tinyboy_mago.def.json
+++ b/resources/definitions/tinyboy_mago.def.json
@@ -7,6 +7,10 @@
         "author": "Fred Chan",
         "manufacturer": "TinyBoy / mago",
         "category": "tinyboy",				
+        "file_formats": "text/x-gcode",
+		"has_materials": false,
+        "has_machine_quality": true,
+        "preferred_quality_type": "normal",		
 		"machine_extruder_trains":
         {
             "0": "tinyboy_extruder_0"
diff --git a/resources/definitions/tinyboy_ra20.def.json b/resources/definitions/tinyboy_ra20.def.json
index 208d11e9c8..413a6a830a 100644
--- a/resources/definitions/tinyboy_ra20.def.json
+++ b/resources/definitions/tinyboy_ra20.def.json
@@ -7,9 +7,13 @@
         "author": "Fred Chan",
         "manufacturer": "TinyBoy / mago",
         "category": "tinyboy",				
+        "file_formats": "text/x-gcode",
         "platform": "tinyboy_ra20.obj",
 		"platform_texture": "tinyboy2.png",		
 		"platform_offset": [ 8, -70, -8 ],
+		"has_materials": false,
+        "has_machine_quality": true,
+        "preferred_quality_type": "normal",		
 		"machine_extruder_trains":
         {
             "0": "tinyboy_extruder_0"
diff --git a/resources/images/TINYBOY.png b/resources/images/TINYBOY.png
deleted file mode 100644
index 583c578a9a..0000000000
Binary files a/resources/images/TINYBOY.png and /dev/null differ
diff --git a/resources/images/hkmakers.png b/resources/images/hkmakers.png
deleted file mode 100644
index 43a0836f54..0000000000
Binary files a/resources/images/hkmakers.png and /dev/null differ