diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 051204f1e..43871b0f8 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -63,7 +63,7 @@ enum ConfigOptionType {
 
 enum ConfigOptionMode {
     comSimple,
-    comMiddle,
+    comAdvanced,
     comExpert
 };
 
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 2b21a760f..4e1de0991 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -39,7 +39,7 @@ void PrintConfigDef::init_common_params()
 
     def = this->add("bed_shape", coPoints);
     def->label = L("Bed shape");
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionPoints{ Vec2d(0, 0), Vec2d(200, 0), Vec2d(200, 200), Vec2d(0, 200) };
     
     def = this->add("layer_height", coFloat);
@@ -57,7 +57,7 @@ void PrintConfigDef::init_common_params()
     def->tooltip = L("Set this to the maximum height that can be reached by your extruder while printing.");
     def->sidetext = L("mm");
     def->cli = "max-print-height=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(200.0);
 }
 
@@ -75,7 +75,7 @@ void PrintConfigDef::init_fff_params()
                    "This is mostly useful with Bowden extruders which suffer from oozing. "
                    "This feature slows down both the print and the G-code generation.");
     def->cli = "avoid-crossing-perimeters!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("bed_temperature", coInts);
@@ -138,7 +138,7 @@ void PrintConfigDef::init_fff_params()
 	def->sidetext = L("°");
     def->cli = "bridge-angle=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0.);
 
     def = this->add("bridge_fan_speed", coInts);
@@ -161,7 +161,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "bridge-flow-ratio=f";
     def->min = 0;
 	def->max = 2;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
 	def->default_value = new ConfigOptionFloat(1);
 
     def = this->add("bridge_speed", coFloat);
@@ -180,7 +180,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "brim-width=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0);
 
     def = this->add("clip_multipart_objects", coBool);
@@ -194,7 +194,7 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("compatible_printers", coStrings);
     def->label = L("Compatible printers");
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionStrings();
 
     def = this->add("compatible_printers_condition", coString);
@@ -217,7 +217,7 @@ void PrintConfigDef::init_fff_params()
                    "This feature is useful to avoid the risk of ruined prints. "
                    "Slic3r should warn and prevent you from extruder collisions, but beware.");
     def->cli = "complete-objects!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("cooling", coBools);
@@ -233,7 +233,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "cooling_tube_retraction=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(91.5f);
 
     def = this->add("cooling_tube_length", coFloat);
@@ -242,7 +242,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "cooling_tube_length=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(5.f);
 
     def = this->add("default_acceleration", coFloat);
@@ -285,7 +285,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Experimental option for preventing support material from being generated "
                    "under bridged areas.");
     def->cli = "dont-support-bridges!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("duplicate_distance", coFloat);
@@ -337,7 +337,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness "
                    "(top+bottom solid layers).");
     def->cli = "ensure-vertical-shell-thickness!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("external_fill_pattern", coEnum);
@@ -369,7 +369,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example 200%), it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "external-perimeter-extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("external_perimeter_speed", coFloatOrPercent);
@@ -400,7 +400,7 @@ void PrintConfigDef::init_fff_params()
                    "Slic3r keeps adding perimeters, until more than 70% of the loop immediately above "
                    "is supported.");
     def->cli = "extra-perimeters!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("extruder", coInt);
@@ -458,7 +458,7 @@ void PrintConfigDef::init_fff_params()
                    "from the XY coordinate).");
     def->sidetext = L("mm");
     def->cli = "extruder-offset=s@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionPoints { Vec2d(0,0) };
 
     def = this->add("extrusion_axis", coString);
@@ -475,7 +475,7 @@ void PrintConfigDef::init_fff_params()
                    "Usual values are between 0.9 and 1.1. If you think you need to change this more, "
                    "check filament diameter and your firmware E steps.");
     def->cli = "extrusion-multiplier=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 1. };
     
     def = this->add("extrusion_width", coFloatOrPercent);
@@ -487,7 +487,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example: 230%), it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for auto)");
     def->cli = "extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("fan_always_on", coBools);
@@ -523,7 +523,7 @@ void PrintConfigDef::init_fff_params()
     def->multiline = true;
     def->full_width = true;
     def->height = 130;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionStrings { "" };
 
     def = this->add("filament_max_volumetric_speed", coFloats);
@@ -534,7 +534,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³/s");
     def->cli = "filament-max-volumetric-speed=f@";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("filament_loading_speed", coFloats);
@@ -714,7 +714,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "fill-angle=f";
     def->min = 0;
     def->max = 360;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(45);
 
     def = this->add("fill_density", coPercent);
@@ -820,7 +820,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "first-layer-extrusion-width=s";
     def->ratio_over = "first_layer_height";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(200, true);
 
     def = this->add("first_layer_height", coFloatOrPercent);
@@ -843,7 +843,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s or %");
     def->cli = "first-layer-speed=s";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(30, false);
 
     def = this->add("first_layer_temperature", coInts);
@@ -923,7 +923,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "infill-every-layers=i";
     def->full_label = L("Combine infill every n layers");
     def->min = 1;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("infill_extruder", coInt);
@@ -932,7 +932,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The extruder to use when printing infill.");
     def->cli = "infill-extruder=i";
     def->min = 1;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("infill_extrusion_width", coFloatOrPercent);
@@ -944,7 +944,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example 90%) it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "infill-extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("infill_first", coBool);
@@ -961,7 +961,7 @@ void PrintConfigDef::init_fff_params()
                    "(it will act as internal support material). If enabled, slows down the G-code generation "
                    "due to the multiple checks involved.");
     def->cli = "infill-only-where-needed!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("infill_overlap", coFloatOrPercent);
@@ -1060,7 +1060,7 @@ void PrintConfigDef::init_fff_params()
 			def->sidetext = L("mm/s");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
-            def->mode = comMiddle;
+            def->mode = comAdvanced;
 			def->default_value = new ConfigOptionFloats(axis.max_feedrate);
 			// Add the machine acceleration limits for XYZE axes (M201)
 			def = this->add("machine_max_acceleration_" + axis.name, coFloats);
@@ -1070,7 +1070,7 @@ void PrintConfigDef::init_fff_params()
 			def->sidetext = L("mm/s²");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
-            def->mode = comMiddle;
+            def->mode = comAdvanced;
 			def->default_value = new ConfigOptionFloats(axis.max_acceleration);
 			// Add the machine jerk limits for XYZE axes (M205)
 			def = this->add("machine_max_jerk_" + axis.name, coFloats);
@@ -1080,7 +1080,7 @@ void PrintConfigDef::init_fff_params()
 			def->sidetext = L("mm/s");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
-            def->mode = comMiddle;
+            def->mode = comAdvanced;
 			def->default_value = new ConfigOptionFloats(axis.max_jerk);
 		}
 	}
@@ -1093,7 +1093,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
 	def->width = machine_limits_opt_width;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
 	def->default_value = new ConfigOptionFloats{ 0., 0. };
 
     // M205 T... [mm/sec]
@@ -1104,7 +1104,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
 	def->width = machine_limits_opt_width;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
 	def->default_value = new ConfigOptionFloats{ 0., 0. };
 
     // M204 S... [mm/sec^2]
@@ -1115,7 +1115,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
 	def->width = machine_limits_opt_width;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats{ 1500., 1250. };
 
     // M204 T... [mm/sec^2]
@@ -1126,7 +1126,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
 	def->width = machine_limits_opt_width;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats{ 1500., 1250. };
 
     def = this->add("max_fan_speed", coInts);
@@ -1148,7 +1148,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "max-layer-height=f@";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("max_print_speed", coFloat);
@@ -1213,7 +1213,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "min-layer-height=f@";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0.07 };
 
     def = this->add("min_print_speed", coFloats);
@@ -1244,7 +1244,7 @@ void PrintConfigDef::init_fff_params()
     def->multiline = true;
     def->full_width = true;
     def->height = 130;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionString("");
 
     def = this->add("nozzle_diameter", coFloats);
@@ -1264,7 +1264,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("duet");
     def->enum_labels.push_back("OctoPrint");
     def->enum_labels.push_back("Duet");
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionEnum<PrintHostType>(htOctoPrint);
 
     def = this->add("printhost_apikey", coString);
@@ -1272,7 +1272,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
                    "the API Key or the password required for authentication.");
     def->cli = "printhost-apikey=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionString("");
     
     def = this->add("printhost_cafile", coString);
@@ -1287,7 +1287,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
                    "the hostname, IP address or URL of the printer host instance.");
     def->cli = "print-host=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionString("");
 
     def = this->add("only_retract_when_crossing_perimeters", coBool);
@@ -1324,7 +1324,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Experimental option to adjust flow for overhangs (bridge flow will be used), "
                    "to apply bridge speed to them and enable fan.");
     def->cli = "overhangs!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("parking_pos_retraction", coFloat);
@@ -1334,7 +1334,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "parking_pos_retraction=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(92.f);
 
     def = this->add("extra_loading_move", coFloat);
@@ -1344,7 +1344,7 @@ void PrintConfigDef::init_fff_params()
                       " if negative, the loading move is shorter than unloading. ");
     def->sidetext = L("mm");
     def->cli = "extra_loading_move=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(-2.f);
 
     def = this->add("perimeter_acceleration", coFloat);
@@ -1364,7 +1364,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "perimeter-extruder=i";
     def->aliases = { "perimeters_extruder" };
     def->min = 1;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("perimeter_extrusion_width", coFloatOrPercent);
@@ -1377,7 +1377,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "perimeter-extrusion-width=s";
     def->aliases = { "perimeters_extrusion_width" };
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("perimeter_speed", coFloat);
@@ -1429,7 +1429,7 @@ void PrintConfigDef::init_fff_params()
     def->multiline = true;
     def->full_width = true;
     def->height = 130;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionString("");
 
     def = this->add("printer_vendor", coString);
@@ -1456,7 +1456,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->cli = "raft-layers=i";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(0);
 
     def = this->add("resolution", coFloat);
@@ -1476,7 +1476,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Retraction is not triggered when travel moves are shorter than this length.");
     def->sidetext = L("mm");
     def->cli = "retract-before-travel=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 2. };
 
     def = this->add("retract_before_wipe", coPercents);
@@ -1485,14 +1485,14 @@ void PrintConfigDef::init_fff_params()
                    "before doing the wipe movement.");
     def->sidetext = L("%");
     def->cli = "retract-before-wipe=s@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionPercents { 0. };
     
     def = this->add("retract_layer_change", coBools);
     def->label = L("Retract on layer change");
     def->tooltip = L("This flag enforces a retraction whenever a Z move is done.");
     def->cli = "retract-layer-change!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBools { false };
 
     def = this->add("retract_length", coFloats);
@@ -1531,7 +1531,7 @@ void PrintConfigDef::init_fff_params()
                    "absolute Z. You can tune this setting for skipping lift on the first layers.");
     def->sidetext = L("mm");
     def->cli = "retract-lift-above=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("retract_lift_below", coFloats);
@@ -1542,7 +1542,7 @@ void PrintConfigDef::init_fff_params()
                    "to the first layers.");
     def->sidetext = L("mm");
     def->cli = "retract-lift-below=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("retract_restart_extra", coFloats);
@@ -1551,7 +1551,7 @@ void PrintConfigDef::init_fff_params()
                    "this additional amount of filament. This setting is rarely needed.");
     def->sidetext = L("mm");
     def->cli = "retract-restart-extra=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("retract_restart_extra_toolchange", coFloats);
@@ -1569,7 +1569,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The speed for retractions (it only applies to the extruder motor).");
     def->sidetext = L("mm/s");
     def->cli = "retract-speed=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 40. };
 
     def = this->add("deretract_speed", coFloats);
@@ -1579,7 +1579,7 @@ void PrintConfigDef::init_fff_params()
                    "(it only applies to the extruder motor). If left to zero, the retraction speed is used.");
     def->sidetext = L("mm/s");
     def->cli = "retract-speed=f@";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloats { 0. };
 
     def = this->add("seam_position", coEnum);
@@ -1596,7 +1596,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Nearest"));
     def->enum_labels.push_back(L("Aligned"));
     def->enum_labels.push_back(L("Rear")); 
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionEnum<SeamPosition>(spAligned);
 
 #if 0
@@ -1659,7 +1659,7 @@ void PrintConfigDef::init_fff_params()
                    "as a shield against drafts.");
     def->sidetext = L("layers");
     def->cli = "skirt-height=i";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("skirts", coInt);
@@ -1670,7 +1670,7 @@ void PrintConfigDef::init_fff_params()
                    "to disable skirt completely.");
     def->cli = "skirts=i";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
     
     def = this->add("slowdown_below_layer_time", coInts);
@@ -1713,7 +1713,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The extruder to use when printing solid infill.");
     def->cli = "solid-infill-extruder=i";
     def->min = 1;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("solid_infill_every_layers", coInt);
@@ -1737,7 +1737,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example 90%) it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "solid-infill-extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("solid_infill_speed", coFloatOrPercent);
@@ -1826,7 +1826,7 @@ void PrintConfigDef::init_fff_params()
     def->label = L("Prime all printing extruders");
     def->tooltip = L("If enabled, all printing extruders will be primed at the front edge of the print bed at the start of the print.");
     def->cli = "single-extruder-multi-material-priming!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("support_material", coBool);
@@ -1842,7 +1842,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("If checked, supports will be generated automatically based on the overhang threshold value."\
                      " If unchecked, supports will be generated inside the \"Support Enforcer\" volumes only.");
     def->cli = "support-material-auto!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("support_material_xy_spacing", coFloatOrPercent);
@@ -1854,7 +1854,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "support-material-xy-spacing=s";
     def->ratio_over = "external_perimeter_extrusion_width";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     // Default is half the external perimeter width.
     def->default_value = new ConfigOptionFloatOrPercent(50, true);
 
@@ -1874,7 +1874,7 @@ void PrintConfigDef::init_fff_params()
     def->category = L("Support material");
     def->tooltip = L("Only create support if it lies on a build plate. Don't create support on a print.");
     def->cli = "support-material-buildplate-only!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("support_material_contact_distance", coFloat);
@@ -1891,7 +1891,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("0.2");
 	def->enum_labels.push_back((boost::format("0 (%1%)") % L("soluble")).str());
 	def->enum_labels.push_back((boost::format("0.2 (%1%)") % L("detachable")).str());
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0.2);
 
     def = this->add("support_material_enforce_layers", coInt);
@@ -1915,7 +1915,7 @@ void PrintConfigDef::init_fff_params()
                    "(1+, 0 to use the current extruder to minimize tool changes).");
     def->cli = "support-material-extruder=i";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("support_material_extrusion_width", coFloatOrPercent);
@@ -1926,7 +1926,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example 90%) it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "support-material-extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("support_material_interface_contact_loops", coBool);
@@ -1944,7 +1944,7 @@ void PrintConfigDef::init_fff_params()
                    "(1+, 0 to use the current extruder to minimize tool changes). This affects raft too.");
     def->cli = "support-material-interface-extruder=i";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(1);
 
     def = this->add("support_material_interface_layers", coInt);
@@ -1954,7 +1954,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->cli = "support-material-interface-layers=i";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(3);
 
     def = this->add("support_material_interface_spacing", coFloat);
@@ -1964,7 +1964,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "support-material-interface-spacing=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0);
 
     def = this->add("support_material_interface_speed", coFloatOrPercent);
@@ -1990,7 +1990,7 @@ void PrintConfigDef::init_fff_params()
 	def->enum_labels.push_back(L("Rectilinear"));
     def->enum_labels.push_back(L("Rectilinear grid"));
     def->enum_labels.push_back(L("Honeycomb"));
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear);
 
     def = this->add("support_material_spacing", coFloat);
@@ -2000,7 +2000,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->cli = "support-material-spacing=f";
     def->min = 0;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(2.5);
 
     def = this->add("support_material_speed", coFloat);
@@ -2033,7 +2033,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "support-material-threshold=i";
     def->min = 0;
     def->max = 90;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionInt(0);
 
     def = this->add("support_material_with_sheath", coBool);
@@ -2061,7 +2061,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Detect single-width walls (parts where two extrusions don't fit and we need "
                    "to collapse them into a single trace).");
     def->cli = "thin-walls!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("threads", coInt);
@@ -2097,7 +2097,7 @@ void PrintConfigDef::init_fff_params()
                    "If expressed as percentage (for example 90%) it will be computed over layer height.");
     def->sidetext = L("mm or % (leave 0 for default)");
     def->cli = "top-infill-extrusion-width=s";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloatOrPercent(0, false);
 
     def = this->add("top_solid_infill_speed", coFloatOrPercent);
@@ -2130,7 +2130,7 @@ void PrintConfigDef::init_fff_params()
     def->cli = "travel-speed=f";
     def->aliases = { "travel_feed_rate" };
     def->min = 1;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(130);
 
     def = this->add("use_firmware_retraction", coBool);
@@ -2174,7 +2174,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("This flag will move the nozzle while retracting to minimize the possible blob "
                    "on leaky extruders.");
     def->cli = "wipe!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBools { false };
 
     def = this->add("wipe_tower", coBool);
@@ -2182,7 +2182,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Multi material printers may need to prime or purge extruders on tool changes. "
                    "Extrude the excess material into the wipe tower.");
     def->cli = "wipe-tower!";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("wiping_volumes_extruders", coFloats);
@@ -2209,7 +2209,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("X coordinate of the left front corner of a wipe tower");
     def->sidetext = L("mm");
     def->cli = "wipe-tower-x=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(180.);
 
     def = this->add("wipe_tower_y", coFloat);
@@ -2217,7 +2217,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Y coordinate of the left front corner of a wipe tower");
     def->sidetext = L("mm");
     def->cli = "wipe-tower-y=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(140.);
 
     def = this->add("wipe_tower_width", coFloat);
@@ -2225,7 +2225,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Width of a wipe tower");
     def->sidetext = L("mm");
     def->cli = "wipe-tower-width=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(60.);
 
     def = this->add("wipe_tower_rotation_angle", coFloat);
@@ -2233,7 +2233,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Wipe tower rotation angle with respect to x-axis ");
     def->sidetext = L("degrees");
     def->cli = "wipe-tower-rotation-angle=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0.);
 
     def = this->add("wipe_into_infill", coBool);
@@ -2259,7 +2259,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Maximal distance between supports on sparse infill sections. ");
     def->sidetext = L("mm");
     def->cli = "wipe-tower-bridging=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(10.);
 
     def = this->add("xy_size_compensation", coFloat);
@@ -2281,7 +2281,7 @@ void PrintConfigDef::init_fff_params()
                    "from the print bed, set this to -0.3 (or fix your endstop).");
     def->sidetext = L("mm");
     def->cli = "z-offset=f";
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionFloat(0);
 
     def = this->add("bed_size_x", coFloat);
@@ -2417,7 +2417,7 @@ void PrintConfigDef::init_sla_params()
     def->multiline = true;
     def->full_width = true;
     def->height = 130;
-    def->mode = comMiddle;
+    def->mode = comAdvanced;
     def->default_value = new ConfigOptionString("");
 
     def = this->add("default_sla_material_profile", coString);
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 43d54abde..0bdaa2cee 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -473,7 +473,7 @@ ConfigMenuIDs GUI_App::get_view_mode()
 
     const auto mode = app_config->get("view_mode");
     return mode == "expert" ? ConfigMenuModeExpert : 
-           mode == "simple" ? ConfigMenuModeSimple : ConfigMenuModeMiddle;
+           mode == "simple" ? ConfigMenuModeSimple : ConfigMenuModeAdvanced;
 }
 
 // Update view mode according to selected menu
@@ -493,7 +493,7 @@ void GUI_App::update_mode()
     mainframe->m_plater->Layout();
 
     ConfigOptionMode opt_mode = mode == ConfigMenuModeSimple ? comSimple :
-                                mode == ConfigMenuModeExpert ? comExpert : comMiddle;
+                                mode == ConfigMenuModeExpert ? comExpert : comAdvanced;
     for (auto tab : tabs_list)
         tab->update_visibility(opt_mode);
 }
@@ -515,7 +515,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
     local_menu->AppendSeparator();
     auto mode_menu = new wxMenu();
     mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _(L("&Simple")), _(L("Simple View Mode")));
-    mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeMiddle, _(L("&Advanced")), _(L("Advanced View Mode")));
+    mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _(L("&Advanced")), _(L("Advanced View Mode")));
     mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _(L("&Expert")), _(L("Expert View Mode")));
     mode_menu->Check(config_id_base + get_view_mode(), true);
     local_menu->AppendSubMenu(mode_menu, _(L("&Mode")), _(L("Slic3r View Mode")));
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index dcb3685d1..ccc7026ee 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -51,7 +51,7 @@ enum ConfigMenuIDs {
     ConfigMenuUpdate,
     ConfigMenuPreferences,
     ConfigMenuModeSimple,
-    ConfigMenuModeMiddle,
+    ConfigMenuModeAdvanced,
     ConfigMenuModeExpert,
     ConfigMenuLanguage,
     ConfigMenuFlashFirmware,
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 000270e13..bba5161cc 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2768,8 +2768,8 @@ ConfigOptionsGroupShp Page::new_optgroup(const wxString& title, int noncommon_la
             bmp_name = "error.png";
         else {
             auto mode = line.get_options()[0].opt.mode;  //we assume that we have one option per line
-            bmp_name = mode == comExpert ? "mode_expert_.png" :
-                       mode == comMiddle ? "mode_middle_.png" : "mode_simple_.png";
+            bmp_name = mode == comExpert   ? "mode_expert_.png" :
+                       mode == comAdvanced ? "mode_middle_.png" : "mode_simple_.png";
         }                               
         auto bmp = new wxStaticBitmap(parent, wxID_ANY, wxBitmap(from_u8(var(bmp_name)), wxBITMAP_TYPE_PNG));
         return bmp;