diff --git a/README.md b/README.md
index 926126bde0..aebe1df8d9 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,6 @@ Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Le
         --gui               Forces the GUI launch instead of command line slicing (if you
                             supply a model file, it will be loaded into the plater)
         --no-plater         Disable the plater tab
-        --gui-mode          Overrides the configured mode (simple/expert)
         --autosave <file>   Automatically export current configuration to the specified file
     
       Output options:
diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 2763a8fd0f..7ccca6a974 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -30,12 +30,11 @@ sub new_from_defaults {
     my (@opt_keys) = @_;
     
     my $self = $class->new;
-    my $defaults = Slic3r::Config::Full->new;
     if (@opt_keys) {
-        $self->set($_, $defaults->get($_))
-            for grep $defaults->has($_), @opt_keys;
+        $self->set($_, $Options->{$_}{default})
+            for grep exists $Options->{$_}{default}, @opt_keys;
     } else {
-        $self->apply_static($defaults);
+        $self->apply_static(Slic3r::Config::Full->new);
     }
     return $self;
 }
diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index 0ab4112778..eb5a7bd01c 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -5,7 +5,9 @@ use utf8;
 
 use File::Basename qw(basename);
 use FindBin;
-use List::Util qw(first);
+use List::Util qw(first any);
+use Slic3r::Geometry qw(X Y);
+
 use Slic3r::GUI::2DBed;
 use Slic3r::GUI::AboutDialog;
 use Slic3r::GUI::BedShapeDialog;
@@ -31,9 +33,10 @@ use Slic3r::GUI::ProgressStatusBar;
 use Slic3r::GUI::Projector;
 use Slic3r::GUI::OptionsGroup;
 use Slic3r::GUI::OptionsGroup::Field;
-use Slic3r::GUI::SimpleTab;
+use Slic3r::GUI::Preset;
+use Slic3r::GUI::PresetEditor;
+use Slic3r::GUI::PresetEditorDialog;
 use Slic3r::GUI::SLAPrintOptions;
-use Slic3r::GUI::Tab;
 
 our $have_OpenGL = eval "use Slic3r::GUI::3DScene; 1";
 our $have_LWP    = eval "use LWP::UserAgent; 1";
@@ -59,15 +62,12 @@ use constant AMF_MODEL_WILDCARD => join '|', @{&FILE_WILDCARDS}{qw(amf)};
 our $datadir;
 # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
 our $no_controller;
-our $no_plater;
-our $mode;
 our $autosave;
 our $threads;
 our @cb;
 
 our $Settings = {
     _ => {
-        mode => 'simple',
         version_check => 1,
         autocenter => 1,
         invert_zoom => 0,
@@ -100,6 +100,7 @@ sub OnInit {
     Slic3r::debugf "wxWidgets version %s, Wx version %s\n", &Wx::wxVERSION_STRING, $Wx::VERSION;
     
     $self->{notifier} = Slic3r::GUI::Notifier->new;
+    $self->{presets} = { print => [], filament => [], printer => [] };
     
     # locate or create data directory
     # Unix: ~/.Slic3r
@@ -131,18 +132,25 @@ sub OnInit {
                 for grep !exists $ini->{_}{$_}, keys %{$Settings->{_}};
             $Settings = $ini;
         }
+        delete $Settings->{_}{mode};  # handle legacy
     }
     $Settings->{_}{version} = $Slic3r::VERSION;
     $Settings->{_}{threads} = $threads if $threads;
     $self->save_settings;
     
+    if (-f "$enc_datadir/simple.ini") {
+        # The Simple Mode settings were already automatically duplicated to presets
+        # named "Simple Mode" in each group, so we already support retrocompatibility.
+        unlink "$enc_datadir/simple.ini";
+    }
+    
+    $self->load_presets;
+    
     # application frame
     Wx::Image::AddHandler(Wx::PNGHandler->new);
     $self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new(
-        mode            => $mode // $Settings->{_}{mode},
         # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
         no_controller   => $no_controller // $Settings->{_}{no_controller},
-        no_plater       => $no_plater,
     );
     $self->SetTopWindow($frame);
     
@@ -279,21 +287,64 @@ sub save_settings {
     Slic3r::Config->write_ini("$datadir/slic3r.ini", $Settings);
 }
 
-sub presets {
-    my ($self, $section) = @_;
+sub presets { return $_[0]->{presets}; }
+
+sub load_presets {
+    my ($self) = @_;
     
-    my %presets = ();
-    opendir my $dh, Slic3r::encode_path("$Slic3r::GUI::datadir/$section")
-        or die "Failed to read directory $Slic3r::GUI::datadir/$section (errno: $!)\n";
-    foreach my $file (grep /\.ini$/i, readdir $dh) {
-        $file = Slic3r::decode_path($file);
-        my $name = basename($file);
-        $name =~ s/\.ini$//;
-        $presets{$name} = "$Slic3r::GUI::datadir/$section/$file";
+    for my $group (qw(printer filament print)) {
+        my $presets = $self->{presets}{$group};
+        
+        # keep external or dirty presets
+        @$presets = grep { ($_->external && $_->file_exists) || $_->dirty } @$presets;
+        
+        my $dir = "$Slic3r::GUI::datadir/$group";
+        opendir my $dh, Slic3r::encode_path($dir)
+            or die "Failed to read directory $dir (errno: $!)\n";
+        foreach my $file (grep /\.ini$/i, readdir $dh) {
+            $file = Slic3r::decode_path($file);
+            my $name = basename($file);
+            $name =~ s/\.ini$//i;
+            
+            # skip if we already have it
+            next if any { $_->name eq $name } @$presets;
+            
+            push @$presets, Slic3r::GUI::Preset->new(
+                group   => $group,
+                name    => $name,
+                file    => "$dir/$file",
+            );
+        }
+        closedir $dh;
+    
+        @$presets = sort { $a->name cmp $b->name } @$presets;
+    
+        unshift @$presets, Slic3r::GUI::Preset->new(
+            group   => $group,
+            default => 1,
+            name    => '- default -',
+        );
     }
-    closedir $dh;
+}
+
+sub add_external_preset {
+    my ($self, $file) = @_;
     
-    return %presets;
+    my $name = basename($file);  # keep .ini suffix
+    for my $group (qw(printer filament print)) {
+        my $presets = $self->{presets}{$group};
+        
+        # remove any existing preset with the same name
+        @$presets = grep { $_->name ne $name } @$presets;
+        
+        push @$presets, Slic3r::GUI::Preset->new(
+            group    => $group,
+            name     => $name,
+            file     => $file,
+            external => 1,
+        );
+    }
+    return $name;
 }
 
 sub have_version_check {
@@ -377,4 +428,38 @@ sub scan_serial_ports {
     return grep !/Bluetooth|FireFly/, @ports;
 }
 
+sub set_menu_item_icon {
+    my ($self, $menuItem, $icon) = @_;
+    
+    # SetBitmap was not available on OS X before Wx 0.9927
+    if ($icon && $menuItem->can('SetBitmap')) {
+        $menuItem->SetBitmap(Wx::Bitmap->new($Slic3r::var->($icon), wxBITMAP_TYPE_PNG));
+    }
+}
+
+sub save_window_pos {
+    my ($self, $window, $name) = @_;
+    
+    $Settings->{_}{"${name}_pos"}  = join ',', $window->GetScreenPositionXY;
+    $Settings->{_}{"${name}_size"} = join ',', $window->GetSizeWH;
+    $Settings->{_}{"${name}_maximized"}      = $window->IsMaximized;
+    $self->save_settings;
+}
+
+sub restore_window_pos {
+    my ($self, $window, $name) = @_;
+    
+    if (defined $Settings->{_}{"${name}_pos"}) {
+        my $size = [ split ',', $Settings->{_}{"${name}_size"}, 2 ];
+        $window->SetSize($size);
+        
+        my $display = Wx::Display->new->GetClientArea();
+        my $pos = [ split ',', $Settings->{_}{"${name}_pos"}, 2 ];
+        if (($pos->[X] + $size->[X]/2) < $display->GetRight && ($pos->[Y] + $size->[Y]/2) < $display->GetBottom) {
+            $window->Move($pos);
+        }
+        $window->Maximize(1) if $Settings->{_}{"${name}_maximized"};
+    }
+}
+
 1;
diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 7c9ae2deeb..09801fe6df 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -54,13 +54,13 @@ use constant HAS_VBO        => eval { glGenBuffersARB_p(0); 1 };
 
 
 # phi / theta angles to orient the camera.
-use constant VIEW_ISO        => [45.0,45.0];
-use constant VIEW_LEFT       => [90.0,90.0];
-use constant VIEW_RIGHT      => [-90.0,90.0];
 use constant VIEW_TOP        => [0.0,0.0];
 use constant VIEW_BOTTOM     => [0.0,180.0];
+use constant VIEW_LEFT       => [90.0,90.0];
+use constant VIEW_RIGHT      => [-90.0,90.0];
 use constant VIEW_FRONT      => [0.0,90.0];
-use constant VIEW_REAR       => [180.0,90.0];
+use constant VIEW_BACK       => [180.0,90.0];
+use constant VIEW_DIAGONAL   => [45.0,45.0];
 
 use constant GIMBAL_LOCK_THETA_MAX => 170;
 
@@ -338,20 +338,20 @@ sub select_view {
     if (ref($direction)) {
         $dirvec = $direction;
     } else {
-        if ($direction eq 'iso') {
-            $dirvec = VIEW_ISO;
+        if ($direction eq 'top') {
+            $dirvec = VIEW_TOP;
+        } elsif ($direction eq 'bottom') {
+            $dirvec = VIEW_BOTTOM;
         } elsif ($direction eq 'left') {
             $dirvec = VIEW_LEFT;
         } elsif ($direction eq 'right') {
             $dirvec = VIEW_RIGHT;
-        } elsif ($direction eq 'top') {
-            $dirvec = VIEW_TOP;
-        } elsif ($direction eq 'bottom') {
-            $dirvec = VIEW_BOTTOM;
         } elsif ($direction eq 'front') {
             $dirvec = VIEW_FRONT;
-        } elsif ($direction eq 'rear') {
-            $dirvec = VIEW_REAR;
+        } elsif ($direction eq 'back') {
+            $dirvec = VIEW_BACK;
+        } elsif ($direction eq 'diagonal') {
+            $dirvec = VIEW_DIAGONAL;
         }
     }
     $self->_sphi($dirvec->[0]);
diff --git a/lib/Slic3r/GUI/Controller.pm b/lib/Slic3r/GUI/Controller.pm
index c6a568f82a..87b85fde27 100644
--- a/lib/Slic3r/GUI/Controller.pm
+++ b/lib/Slic3r/GUI/Controller.pm
@@ -7,6 +7,7 @@ use strict;
 use warnings;
 use utf8;
 
+use List::Util qw(any);
 use Wx qw(wxTheApp :frame :id :misc :sizer :bitmap :button :icon :dialog);
 use Wx::Event qw(EVT_CLOSE EVT_LEFT_DOWN EVT_MENU);
 use base qw(Wx::ScrolledWindow Class::Accessor);
@@ -39,14 +40,14 @@ sub new {
         
         EVT_LEFT_DOWN($btn, sub {
             my $menu = Wx::Menu->new;
-            my %presets = wxTheApp->presets('printer');
+            my %presets = map { $_->name => $_ } wxTheApp->presets('printer');
             
             # remove printers that already exist
             my @panels = $self->print_panels;
             delete $presets{$_} for map $_->printer_name, @panels;
             
             foreach my $preset_name (sort keys %presets) {
-                my $config = Slic3r::Config->load($presets{$preset_name});
+                my $config = $presets{$preset_name}->dirty_config;
                 next if !$config->serial_port;
                 
                 my $id = &Wx::NewId();
@@ -100,8 +101,8 @@ sub OnActivate {
     # get all available presets
     my %presets = ();
     {
-        my %all = wxTheApp->presets('printer');
-        my %configs = map { my $name = $_; $name => Slic3r::Config->load($all{$name}) } keys %all;
+        my %all = map { $_->name => $_ } @{wxTheApp->presets->{printer}};
+        my %configs = map { my $name = $_; $name => $all{$name}->load_config } keys %all;
         %presets = map { $_ => $configs{$_} } grep $configs{$_}->serial_port, keys %all;
     }
     
@@ -177,6 +178,12 @@ sub print_panels {
         map $_->GetWindow, $self->{sizer}->GetChildren;
 }
 
+sub printing {
+    my ($self) = @_;
+    
+    return any { $_->printing } $self->print_panels;
+}
+
 sub update_presets {
     my $self = shift;
     my ($group, $presets, $selected, $is_dirty) = @_;
diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index 92ee27954d..f779de3050 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -28,11 +28,8 @@ sub new {
     }
     
     # store input params
-    $self->{mode} = $params{mode};
-    $self->{mode} = 'expert' if $self->{mode} !~ /^(?:simple|expert)$/;
     # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
     $self->{no_controller} = $params{no_controller};
-    $self->{no_plater} = $params{no_plater};
     $self->{loaded} = 0;
     
     # initialize tabpanel and menubar
@@ -59,19 +56,8 @@ sub new {
         $self->SetSizer($sizer);
         $self->Fit;
         $self->SetMinSize([760, 490]);
-        if (defined $Slic3r::GUI::Settings->{_}{main_frame_size}) {
-            my $size = [ split ',', $Slic3r::GUI::Settings->{_}{main_frame_size}, 2 ];
-            $self->SetSize($size);
-            
-            my $display = Wx::Display->new->GetClientArea();
-            my $pos = [ split ',', $Slic3r::GUI::Settings->{_}{main_frame_pos}, 2 ];
-            if (($pos->[X] + $size->[X]/2) < $display->GetRight && ($pos->[Y] + $size->[Y]/2) < $display->GetBottom) {
-                $self->Move($pos);
-            }
-            $self->Maximize(1) if $Slic3r::GUI::Settings->{_}{main_frame_maximized};
-        } else {
-            $self->SetSize($self->GetMinSize);
-        }
+        $self->SetSize($self->GetMinSize);
+        wxTheApp->restore_window_pos($self, "main_frame");
         $self->Show;
         $self->Layout;
     }
@@ -80,16 +66,24 @@ sub new {
     EVT_CLOSE($self, sub {
         my (undef, $event) = @_;
         
-        if ($event->CanVeto && !$self->check_unsaved_changes) {
-            $event->Veto;
-            return;
+        if ($event->CanVeto) {
+            if (!$self->{plater}->prompt_unsaved_changes) {
+                $event->Veto;
+                return;
+            }
+            
+            if ($self->{controller} && $self->{controller}->printing) {
+                my $confirm = Wx::MessageDialog->new($self, "You are currently printing. Do you want to stop printing and continue anyway?",
+                    'Unfinished Print', wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
+                if ($confirm->ShowModal == wxID_NO) {
+                    $event->Veto;
+                    return;
+                }
+            }
         }
         
         # save window size
-        $Slic3r::GUI::Settings->{_}{main_frame_pos}  = join ',', $self->GetScreenPositionXY;
-        $Slic3r::GUI::Settings->{_}{main_frame_size} = join ',', $self->GetSizeWH;
-        $Slic3r::GUI::Settings->{_}{main_frame_maximized} = $self->IsMaximized;
-        wxTheApp->save_settings;
+        wxTheApp->save_window_pos($self, "main_frame");
         
         # propagate event
         $event->Skip;
@@ -107,71 +101,10 @@ sub _init_tabpanel {
         $panel->OnActivate if $panel->can('OnActivate');
     });
     
-    if (!$self->{no_plater}) {
-        $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
-    }
+    $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
     if (!$self->{no_controller}) {
         $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller");
     }
-    $self->{options_tabs} = {};
-    
-    my $simple_config;
-    if ($self->{mode} eq 'simple') {
-        $simple_config = Slic3r::Config->load("$Slic3r::GUI::datadir/simple.ini")
-            if -e Slic3r::encode_path("$Slic3r::GUI::datadir/simple.ini");
-    }
-    
-    my $class_prefix = $self->{mode} eq 'simple' ? "Slic3r::GUI::SimpleTab::" : "Slic3r::GUI::Tab::";
-    for my $tab_name (qw(print filament printer)) {
-        my $tab;
-        $tab = $self->{options_tabs}{$tab_name} = ($class_prefix . ucfirst $tab_name)->new(
-            $panel, 
-            no_controller => $self->{no_controller});
-        $tab->on_value_change(sub {
-            my ($opt_key, $value) = @_;
-            
-            my $config = $tab->config;
-            if ($self->{plater}) {
-                $self->{plater}->on_config_change($config); # propagate config change events to the plater
-                $self->{plater}->on_extruders_change($value) if $opt_key eq 'extruders_count';
-            }
-            if ($self->{loaded}) {  # don't save while loading for the first time
-                if ($self->{mode} eq 'simple') {
-                    # save config
-                    $self->config->save("$Slic3r::GUI::datadir/simple.ini");
-                    
-                    # save a copy into each preset section
-                    # so that user gets the config when switching to expert mode
-                    $config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $tab->name, 'Simple Mode');
-                    $Slic3r::GUI::Settings->{presets}{$tab->name} = 'Simple Mode.ini';
-                    wxTheApp->save_settings;
-                }
-                $self->config->save($Slic3r::GUI::autosave) if $Slic3r::GUI::autosave;
-            }
-        });
-        $tab->on_presets_changed(sub {
-            if ($self->{plater}) {
-                $self->{plater}->update_presets($tab_name, @_);
-                $self->{plater}->on_config_change($tab->config);
-                if ($self->{controller}) {
-                    $self->{controller}->update_presets($tab_name, @_);
-                }
-            }
-        });
-        $tab->load_presets;
-        $panel->AddPage($tab, $tab->title);
-        $tab->load_config($simple_config) if $simple_config;
-    }
-    
-    if ($self->{plater}) {
-        $self->{plater}->on_select_preset(sub {
-            my ($group, $i) = @_;
-	        $self->{options_tabs}{$group}->select_preset($i);
-        });
-        
-        # load initial config
-        $self->{plater}->on_config_change($self->config);
-    }
 }
 
 sub _init_menubar {
@@ -239,10 +172,16 @@ sub _init_menubar {
     }
     
     # Plater menu
-    unless ($self->{no_plater}) {
+    {
         my $plater = $self->{plater};
         
         $self->{plater_menu} = Wx::Menu->new;
+        {
+            my $selectMenu = $self->{plater_select_menu} = Wx::Menu->new;
+            my $selectMenuItem = $self->{plater_menu}->AppendSubMenu($selectMenu, "Select", 'Select an object in the plater');
+            wxTheApp->set_menu_item_icon($selectMenuItem, 'brick.png');
+        }
+        $self->{plater_menu}->AppendSeparator();
         $self->_append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub {
             $plater->export_gcode;
         }, undef, 'cog_go.png');
@@ -252,57 +191,35 @@ sub _init_menubar {
         $self->_append_menu_item($self->{plater_menu}, "Export plate with modifiers as AMF...", 'Export current plate as AMF, including all modifier meshes', sub {
             $plater->export_amf;
         }, undef, 'brick_go.png');
-        $self->_append_menu_item($self->{plater_menu}, "Open DLP Projector…\tCtrl+L", 'Open projector window for DLP printing', sub {
-            $plater->pause_background_process;
-            Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal;
-            $plater->resume_background_process;
-        }, undef, 'film.png');
         
         $self->{object_menu} = $self->{plater}->object_menu;
         $self->on_plater_selection_changed(0);
     }
     
-    # Window menu
-    my $windowMenu = Wx::Menu->new;
+    # Settings menu
+    my $settingsMenu = Wx::Menu->new;
     {
-        my $tab_offset = 0;
-        if (!$self->{no_plater}) {
-            $self->_append_menu_item($windowMenu, "Select &Plater Tab\tCtrl+1", 'Show the plater', sub {
-                $self->select_tab(0);
-            }, undef, 'application_view_tile.png');
-            $tab_offset += 1;
-        }
-        if (!$self->{no_controller}) {
-            $self->_append_menu_item($windowMenu, "Select &Controller Tab\tCtrl+T", 'Show the printer controller', sub {
-                $self->select_tab(1);
-            }, undef, 'printer_empty.png');
-            $tab_offset += 1;
-        }
-        if ($tab_offset > 0) {
-            $windowMenu->AppendSeparator();
-        }
-        
-        $self->_append_menu_item($windowMenu, "Select P&rint Settings Tab\tCtrl+2", 'Show the print settings', sub {
-            $self->select_tab($tab_offset+0);
+        $self->_append_menu_item($settingsMenu, "P&rint Settings…\tCtrl+1", 'Show the print settings editor', sub {
+            $self->{plater}->show_preset_editor('print');
         }, undef, 'cog.png');
-        $self->_append_menu_item($windowMenu, "Select &Filament Settings Tab\tCtrl+3", 'Show the filament settings', sub {
-            $self->select_tab($tab_offset+1);
+        $self->_append_menu_item($settingsMenu, "&Filament Settings…\tCtrl+2", 'Show the filament settings editor', sub {
+            $self->{plater}->show_preset_editor('filament');
         }, undef, 'spool.png');
-        $self->_append_menu_item($windowMenu, "Select Print&er Settings Tab\tCtrl+4", 'Show the printer settings', sub {
-            $self->select_tab($tab_offset+2);
+        $self->_append_menu_item($settingsMenu, "Print&er Settings…\tCtrl+3", 'Show the printer settings editor', sub {
+            $self->{plater}->show_preset_editor('printer');
         }, undef, 'printer_empty.png');
     }
 
     # View menu
-    if (!$self->{no_plater}) {
+    {
         $self->{viewMenu} = Wx::Menu->new;
-        $self->_append_menu_item($self->{viewMenu}, "Iso"    , 'Iso View'    , sub { $self->select_view('iso'    ); });
-        $self->_append_menu_item($self->{viewMenu}, "Top"    , 'Top View'    , sub { $self->select_view('top'    ); });
-        $self->_append_menu_item($self->{viewMenu}, "Bottom" , 'Bottom View' , sub { $self->select_view('bottom' ); });
-        $self->_append_menu_item($self->{viewMenu}, "Front"  , 'Front View'  , sub { $self->select_view('front'  ); });
-        $self->_append_menu_item($self->{viewMenu}, "Rear"   , 'Rear View'   , sub { $self->select_view('rear'   ); });
-        $self->_append_menu_item($self->{viewMenu}, "Left"   , 'Left View'   , sub { $self->select_view('left'   ); });
-        $self->_append_menu_item($self->{viewMenu}, "Right"  , 'Right View'  , sub { $self->select_view('right'  ); });
+        $self->_append_menu_item($self->{viewMenu}, "Top\tCtrl+4"     , 'Top View'     , sub { $self->select_view('top'     ); });
+        $self->_append_menu_item($self->{viewMenu}, "Bottom\tCtrl+5"  , 'Bottom View'  , sub { $self->select_view('bottom'  ); });
+        $self->_append_menu_item($self->{viewMenu}, "Left\tCtrl+6"    , 'Left View'    , sub { $self->select_view('left'    ); });
+        $self->_append_menu_item($self->{viewMenu}, "Right\tCtrl+7"   , 'Right View'   , sub { $self->select_view('right'   ); });
+        $self->_append_menu_item($self->{viewMenu}, "Front\tCtrl+8"   , 'Front View'   , sub { $self->select_view('front'   ); });
+        $self->_append_menu_item($self->{viewMenu}, "Back\tCtrl+9"    , 'Back View'    , sub { $self->select_view('back'    ); });
+        $self->_append_menu_item($self->{viewMenu}, "Diagonal\tCtrl+0", 'Diagonal View', sub { $self->select_view('diagonal'); });
         $self->{viewMenu}->AppendSeparator();
         $self->{color_toolpaths_by_role} = $self->_append_menu_item($self->{viewMenu},
             "Color Toolpaths by Role",
@@ -331,6 +248,22 @@ sub _init_menubar {
         }
     }
     
+    # Window menu
+    my $windowMenu = Wx::Menu->new;
+    {
+        $self->_append_menu_item($windowMenu, "&Plater\tCtrl+T", 'Show the plater', sub {
+            $self->select_tab(0);
+        }, undef, 'application_view_tile.png');
+        $self->_append_menu_item($windowMenu, "&Controller\tCtrl+Y", 'Show the printer controller', sub {
+            $self->select_tab(1);
+        }, undef, 'printer_empty.png') if !$self->{no_controller};
+        $self->_append_menu_item($windowMenu, "DLP Projector…\tCtrl+P", 'Open projector window for DLP printing', sub {
+            $self->{plater}->pause_background_process;
+            Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal;
+            $self->{plater}->resume_background_process;
+        }, undef, 'film.png');
+    }
+    
     # Help menu
     my $helpMenu = Wx::Menu->new;
     {
@@ -362,8 +295,9 @@ sub _init_menubar {
         $menubar->Append($fileMenu, "&File");
         $menubar->Append($self->{plater_menu}, "&Plater") if $self->{plater_menu};
         $menubar->Append($self->{object_menu}, "&Object") if $self->{object_menu};
-        $menubar->Append($windowMenu, "&Window");
+        $menubar->Append($settingsMenu, "&Settings");
         $menubar->Append($self->{viewMenu}, "&View") if $self->{viewMenu};
+        $menubar->Append($windowMenu, "&Window");
         $menubar->Append($helpMenu, "&Help");
         $self->SetMenuBar($menubar);
     }
@@ -389,7 +323,7 @@ sub quick_slice {
     my $progress_dialog;
     eval {
         # validate configuration
-        my $config = $self->config;
+        my $config = $self->{plater}->config;
         $config->validate;
         
         # select input file
@@ -531,7 +465,7 @@ sub repair_stl {
 sub export_config {
     my $self = shift;
     
-    my $config = $self->config;
+    my $config = $self->{plater}->config;
     eval {
         # validate configuration
         $config->validate;
@@ -557,7 +491,6 @@ sub load_config_file {
     my ($file) = @_;
     
     if (!$file) {
-        return unless $self->check_unsaved_changes;
         my $dir = $last_config ? dirname($last_config) : $Slic3r::GUI::Settings->{recent}{config_directory} || $Slic3r::GUI::Settings->{recent}{skein_directory} || '';
         my $dlg = Wx::FileDialog->new($self, 'Select configuration to load:', $dir, "config.ini", 
                 &Slic3r::GUI::FILE_WILDCARDS->{ini}, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
@@ -568,9 +501,10 @@ sub load_config_file {
     $Slic3r::GUI::Settings->{recent}{config_directory} = dirname($file);
     wxTheApp->save_settings;
     $last_config = $file;
-    for my $tab (values %{$self->{options_tabs}}) {
-        $tab->load_config_file($file);
-    }
+    
+    my $name = wxTheApp->add_external_preset($file);
+    $self->{plater}->load_presets;
+    $self->{plater}->select_preset_by_name($name, $_) for qw(print filament printer);
 }
 
 sub export_configbundle {
@@ -578,7 +512,7 @@ sub export_configbundle {
     
     eval {
         # validate current configuration in case it's dirty
-        $self->config->validate;
+        $self->{plater}->config->validate;
     };
     Slic3r::GUI::catch_error($self) and return;
     
@@ -593,18 +527,14 @@ sub export_configbundle {
         
         # leave default category empty to prevent the bundle from being parsed as a normal config file
         my $ini = { _ => {} };
-        $ini->{settings}{$_} = $Slic3r::GUI::Settings->{_}{$_} for qw(autocenter mode);
+        $ini->{settings}{$_} = $Slic3r::GUI::Settings->{_}{$_} for qw(autocenter);
         $ini->{presets} = $Slic3r::GUI::Settings->{presets};
-        if (-e "$Slic3r::GUI::datadir/simple.ini") {
-            my $config = Slic3r::Config->load("$Slic3r::GUI::datadir/simple.ini");
-            $ini->{simple} = $config->as_ini->{_};
-        }
         
         foreach my $section (qw(print filament printer)) {
-            my %presets = wxTheApp->presets($section);
-            foreach my $preset_name (keys %presets) {
-                my $config = Slic3r::Config->load($presets{$preset_name});
-                $ini->{"$section:$preset_name"} = $config->as_ini->{_};
+            my @presets = @{wxTheApp->presets->{$section}};
+            foreach my $preset (@presets) {
+                next if $preset->default || $preset->external;
+                $ini->{"$section:" . $preset->name} = $preset->load_config->as_ini->{_};
             }
         }
         
@@ -639,15 +569,6 @@ sub load_configbundle {
         $Slic3r::GUI::Settings->{presets} = $ini->{presets};
         wxTheApp->save_settings;
     }
-    if ($ini->{simple}) {
-        my $config = Slic3r::Config->load_ini_hash($ini->{simple});
-        $config->save("$Slic3r::GUI::datadir/simple.ini");
-        if ($self->{mode} eq 'simple') {
-            foreach my $tab (values %{$self->{options_tabs}}) {
-                $tab->load_config($config) for values %{$self->{options_tabs}};
-            }
-        }
-    }
     my $imported = 0;
     INI_BLOCK: foreach my $ini_category (sort keys %$ini) {
         next unless $ini_category =~ /^(print|filament|printer):(.+)$/;
@@ -656,11 +577,11 @@ sub load_configbundle {
         next if $skip_no_id && !$config->get($section . "_settings_id");
         
         {
-            my %current_presets = Slic3r::GUI->presets($section);
+            my @current_presets = @{wxTheApp->presets->{$section}};
             my %current_ids = map { $_ => 1 }
                 grep $_,
-                map Slic3r::Config->load($_)->get($section . "_settings_id"),
-                values %current_presets;
+                map $_->dirty_config->get($section . "_settings_id"),
+                @current_presets;
             next INI_BLOCK if exists $current_ids{$config->get($section . "_settings_id")};
         }
         
@@ -668,150 +589,34 @@ sub load_configbundle {
         Slic3r::debugf "Imported %s preset %s\n", $section, $preset_name;
         $imported++;
     }
-    if ($self->{mode} eq 'expert') {
-        foreach my $tab (values %{$self->{options_tabs}}) {
-            $tab->load_presets;
-        }
-    }
+    $self->{plater}->load_presets;
     
     return if !$imported;
     
     my $message = sprintf "%d presets successfully imported.", $imported;
-    if ($self->{mode} eq 'simple' && $Slic3r::GUI::Settings->{_}{mode} eq 'expert') {
-        Slic3r::GUI::show_info($self, "$message You need to restart Slic3r to make the changes effective.");
-    } else {
-        Slic3r::GUI::show_info($self, $message);
-    }
+    Slic3r::GUI::show_info($self, $message);
 }
 
 sub load_config {
-    my $self = shift;
-    my ($config) = @_;
+    my ($self, $config) = @_;
     
-    foreach my $tab (values %{$self->{options_tabs}}) {
-        $tab->load_config($config);
-    }
-    if ($self->{plater}) {
-        $self->{plater}->on_config_change($config);
-    }
+    $self->{plater}->load_config($config);
 }
 
 sub config_wizard {
     my $self = shift;
 
-    return unless $self->check_unsaved_changes;
     if (my $config = Slic3r::GUI::ConfigWizard->new($self)->run) {
-        if ($self->{mode} eq 'expert') {
-            for my $tab (values %{$self->{options_tabs}}) {
-                $tab->select_default_preset;
-            }
-        } else {
-            # TODO: select default settings in simple mode
-        }
-        $self->load_config($config);
-        if ($self->{mode} eq 'expert') {
-            for my $tab (values %{$self->{options_tabs}}) {
-                $tab->save_preset('My Settings');
-            }
+        foreach my $group (qw(print filament printer)) {
+            my $name = 'My Settings';
+            $config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $group, $name);
+            $Slic3r::GUI::Settings->{presets}{$group} = "$name.ini";
+            $self->{plater}->load_presets;
+            $self->{plater}->select_preset_by_name($name, $group);
         }
     }
 }
 
-=head2 config
-
-This method collects all config values from the tabs and merges them into a single config object.
-
-=cut
-
-sub config {
-    my $self = shift;
-    
-    return Slic3r::Config->new_from_defaults
-        if !exists $self->{options_tabs}{print}
-            || !exists $self->{options_tabs}{filament}
-            || !exists $self->{options_tabs}{printer};
-    
-    # retrieve filament presets and build a single config object for them
-    my $filament_config;
-    if (!$self->{plater} || $self->{plater}->filament_presets == 1 || $self->{mode} eq 'simple') {
-        $filament_config = $self->{options_tabs}{filament}->config;
-    } else {
-        my $i = -1;
-        foreach my $preset_idx ($self->{plater}->filament_presets) {
-            $i++;
-            my $config;
-            if ($preset_idx == $self->{options_tabs}{filament}->current_preset) {
-                # the selected preset for this extruder is the one in the tab
-                # use the tab's config instead of the preset in case it is dirty
-                # perhaps plater shouldn't expose dirty presets at all in multi-extruder environments.
-                $config = $self->{options_tabs}{filament}->config;
-            } else {
-                my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx);
-                $config = $self->{options_tabs}{filament}->get_preset_config($preset);
-            }
-            if (!$filament_config) {
-                $filament_config = $config->clone;
-                next;
-            }
-            foreach my $opt_key (@{$config->get_keys}) {
-                my $value = $filament_config->get($opt_key);
-                next unless ref $value eq 'ARRAY';
-                $value->[$i] = $config->get($opt_key)->[0];
-                $filament_config->set($opt_key, $value);
-            }
-        }
-    }
-    
-    my $config = Slic3r::Config->merge(
-        Slic3r::Config->new_from_defaults,
-        $self->{options_tabs}{print}->config,
-        $self->{options_tabs}{printer}->config,
-        $filament_config,
-    );
-    
-    if ($self->{mode} eq 'simple') {
-        # set some sensible defaults
-        $config->set('first_layer_height', $config->nozzle_diameter->[0]);
-        $config->set('avoid_crossing_perimeters', 1);
-        $config->set('infill_every_layers', 10);
-    } else {
-        my $extruders_count = $self->{options_tabs}{printer}{extruders_count};
-        $config->set("${_}_extruder", min($config->get("${_}_extruder"), $extruders_count))
-            for qw(perimeter infill solid_infill support_material support_material_interface);
-    }
-    
-    return $config;
-}
-
-sub filament_preset_names {
-    my ($self) = @_;
-    
-    if ($self->{mode} eq 'simple') {
-        return '';
-    }
-    
-    return map $self->{options_tabs}{filament}->get_preset($_)->name,
-        $self->{plater}->filament_presets;
-}
-
-sub check_unsaved_changes {
-    my $self = shift;
-    
-    my @dirty = ();
-    foreach my $tab (values %{$self->{options_tabs}}) {
-        push @dirty, $tab->title if $tab->is_dirty;
-    }
-    
-    if (@dirty) {
-        my $titles = join ', ', @dirty;
-        my $confirm = Wx::MessageDialog->new($self, "You have unsaved changes ($titles). Discard changes and continue anyway?",
-                                             'Unsaved Presets', wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
-        return ($confirm->ShowModal == wxID_YES);
-    }
-    
-    return 1;
-}
-
 sub select_tab {
     my ($self, $tab) = @_;
     $self->{tabpanel}->SetSelection($tab);
@@ -820,9 +625,8 @@ sub select_tab {
 # Set a camera direction, zoom to all objects.
 sub select_view {
     my ($self, $direction) = @_;
-    if (! $self->{no_plater}) {
-        $self->{plater}->select_view($direction);
-    }
+    
+    $self->{plater}->select_view($direction);
 }
 
 sub _append_menu_item {
@@ -830,19 +634,10 @@ sub _append_menu_item {
     
     $id //= &Wx::NewId();
     my $item = $menu->Append($id, $string, $description, $kind);
-    $self->_set_menu_item_icon($item, $icon);
+    wxTheApp->set_menu_item_icon($item, $icon);
     
     EVT_MENU($self, $id, $cb);
     return $item;
 }
 
-sub _set_menu_item_icon {
-    my ($self, $menuItem, $icon) = @_;
-    
-    # SetBitmap was not available on OS X before Wx 0.9927
-    if ($icon && $menuItem->can('SetBitmap')) {
-        $menuItem->SetBitmap(Wx::Bitmap->new($Slic3r::var->($icon), wxBITMAP_TYPE_PNG));
-    }
-}
-
 1;
diff --git a/lib/Slic3r/GUI/OptionsGroup.pm b/lib/Slic3r/GUI/OptionsGroup.pm
index 2a00b1a0ca..776f80ec3e 100644
--- a/lib/Slic3r/GUI/OptionsGroup.pm
+++ b/lib/Slic3r/GUI/OptionsGroup.pm
@@ -1,4 +1,4 @@
-# A dialog group object. Used by the Tab, SimpleTab, Preferences dialog, ManualControlDialog etc.
+# A dialog group object. Used by the PresetEditor, Preferences dialog, ManualControlDialog etc.
 
 package Slic3r::GUI::OptionsGroup;
 use Moo;
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 55e331f38d..4f4c3b2049 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -6,16 +6,17 @@ use warnings;
 use utf8;
 
 use File::Basename qw(basename dirname);
-use List::Util qw(sum first max);
+use List::Util qw(sum first max none any);
 use Slic3r::Geometry qw(X Y Z MIN MAX scale unscale deg2rad rad2deg);
 use LWP::UserAgent;
 use threads::shared qw(shared_clone);
-use Wx qw(:button :cursor :dialog :filedialog :keycode :icon :font :id :listctrl :misc 
+use Wx qw(:button :cursor :dialog :filedialog :keycode :icon :font :id :misc 
     :panel :sizer :toolbar :window wxTheApp :notebook :combobox);
-use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_LIST_ITEM_ACTIVATED 
-    EVT_LIST_ITEM_DESELECTED EVT_LIST_ITEM_SELECTED EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL 
+use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL 
     EVT_CHOICE EVT_COMBOBOX EVT_TIMER EVT_NOTEBOOK_PAGE_CHANGED EVT_LEFT_UP);
-use base 'Wx::Panel';
+use base qw(Wx::Panel Class::Accessor);
+
+__PACKAGE__->mk_accessors(qw(presets));
 
 use constant TB_ADD             => &Wx::NewId;
 use constant TB_REMOVE          => &Wx::NewId;
@@ -42,15 +43,13 @@ our $PROCESS_COMPLETED_EVENT : shared = Wx::NewEventType;
 use constant FILAMENT_CHOOSERS_SPACING => 0;
 use constant PROCESS_DELAY => 0.5 * 1000; # milliseconds
 
-my $PreventListEvents = 0;
-
 sub new {
     my $class = shift;
     my ($parent) = @_;
     my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
     $self->{config} = Slic3r::Config->new_from_defaults(qw(
         bed_shape complete_objects extruder_clearance_radius skirts skirt_distance brim_width
-        serial_port serial_speed octoprint_host octoprint_apikey filament_colour
+        serial_port serial_speed octoprint_host octoprint_apikey overridable filament_colour
     ));
     $self->{model} = Slic3r::Model->new;
     $self->{print} = Slic3r::Print->new;
@@ -194,23 +193,6 @@ sub new {
         }
     }
 
-    $self->{list} = Wx::ListView->new($self, -1, wxDefaultPosition, wxDefaultSize,
-        wxLC_SINGLE_SEL | wxLC_REPORT | wxBORDER_SUNKEN | wxTAB_TRAVERSAL | wxWANTS_CHARS );
-    $self->{list}->InsertColumn(0, "Name", wxLIST_FORMAT_LEFT, 145);
-    $self->{list}->InsertColumn(1, "Copies", wxLIST_FORMAT_CENTER, 45);
-    $self->{list}->InsertColumn(2, "Scale", wxLIST_FORMAT_CENTER, wxLIST_AUTOSIZE_USEHEADER);
-    EVT_LIST_ITEM_SELECTED($self, $self->{list}, \&list_item_selected);
-    EVT_LIST_ITEM_DESELECTED($self, $self->{list}, \&list_item_deselected);
-    EVT_LIST_ITEM_ACTIVATED($self, $self->{list}, \&list_item_activated);
-    EVT_KEY_DOWN($self->{list}, sub {
-        my ($list, $event) = @_;
-        if ($event->GetKeyCode == WXK_TAB) {
-            $list->Navigate($event->ShiftDown ? &Wx::wxNavigateBackward : &Wx::wxNavigateForward);
-        } else {
-            $event->Skip;
-        }
-    });
-    
     # right pane buttons
     $self->{btn_export_gcode} = Wx::Button->new($self, -1, "Export G-code…", wxDefaultPosition, [-1, 30], wxBU_LEFT);
     $self->{btn_print} = Wx::Button->new($self, -1, "Print…", wxDefaultPosition, [-1, 30], wxBU_LEFT);
@@ -293,7 +275,7 @@ sub new {
     
     $_->SetDropTarget(Slic3r::GUI::Plater::DropTarget->new($self))
         for grep defined($_),
-            $self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D}, $self->{list};
+            $self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D};
     
     EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub {
         my ($self, $event) = @_;
@@ -344,32 +326,54 @@ sub new {
     $self->on_model_change;
     
     {
-        my $presets;
-        if ($self->GetFrame->{mode} eq 'expert') {
-            $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 2, 1, 2);
-            $presets->AddGrowableCol(1, 1);
-            $presets->SetFlexibleDirection(wxHORIZONTAL);
-            my %group_labels = (
-                print       => 'Print settings',
-                filament    => 'Filament',
-                printer     => 'Printer',
-            );
-            $self->{preset_choosers} = {};
-            for my $group (qw(print filament printer)) {
-                my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
-                $text->SetFont($Slic3r::GUI::small_font);
-                my $choice = Wx::BitmapComboBox->new($self, -1, "", wxDefaultPosition, wxDefaultSize, [], wxCB_READONLY);
-                $self->{preset_choosers}{$group} = [$choice];
-                # setup the listener
-                EVT_COMBOBOX($choice, $choice, sub {
-                    my ($choice) = @_;
-                    wxTheApp->CallAfter(sub {
-                        $self->_on_select_preset($group, $choice);
-                    });
+        my $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 3, 1, 2);
+        $presets->AddGrowableCol(1, 1);
+        $presets->SetFlexibleDirection(wxHORIZONTAL);
+        my %group_labels = (
+            print       => 'Print settings',
+            filament    => 'Filament',
+            printer     => 'Printer',
+        );
+        $self->{preset_choosers} = {};
+        $self->{preset_choosers_names} = {};  # wxChoice* => []
+        for my $group (qw(print filament printer)) {
+            # label
+            my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
+            $text->SetFont($Slic3r::GUI::small_font);
+            
+            # dropdown control
+            my $choice = Wx::BitmapComboBox->new($self, -1, "", wxDefaultPosition, wxDefaultSize, [], wxCB_READONLY);
+            $self->{preset_choosers}{$group} = [$choice];
+            # setup the listener
+            EVT_COMBOBOX($choice, $choice, sub {
+                my ($choice) = @_;
+                wxTheApp->CallAfter(sub {
+                    $self->_on_change_combobox($group, $choice);
                 });
-                $presets->Add($text, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4);
-                $presets->Add($choice, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxBOTTOM, 0);
-            }
+            });
+            
+            # settings button
+            my $settings_btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG), 
+                wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
+            EVT_BUTTON($self, $settings_btn, sub {
+                $self->show_preset_editor($group, 0);
+            });
+            
+            $presets->Add($text, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4);
+            $presets->Add($choice, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxBOTTOM, 0);
+            $presets->Add($settings_btn, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxLEFT, 3);
+        }
+        
+        {
+            my $o = $self->{settings_override_panel} = Slic3r::GUI::Plater::OverrideSettingsPanel->new($self,
+                on_change => sub {
+                    $self->config_changed;
+                });
+            $o->set_editable(1);
+            $o->set_opt_keys([ Slic3r::GUI::PresetEditor::Print->options ]);
+            $self->{settings_override_config} = Slic3r::Config->new;
+            $o->set_default_config($self->{settings_override_config});
+            $o->set_config($self->{settings_override_config});
         }
         
         my $object_info_sizer;
@@ -377,6 +381,27 @@ sub new {
             my $box = Wx::StaticBox->new($self, -1, "Info");
             $object_info_sizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
             $object_info_sizer->SetMinSize([350,-1]);
+            
+            {
+                my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
+                $object_info_sizer->Add($sizer, 0, wxEXPAND | wxBOTTOM, 5);
+                my $text = Wx::StaticText->new($self, -1, "Object:", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+                $text->SetFont($Slic3r::GUI::small_font);
+                $sizer->Add($text, 0, wxALIGN_CENTER_VERTICAL);
+                
+                # We supply a bogus width to wxChoice (sizer will override it and stretch 
+                # the control anyway), because if we leave the default (-1) it will stretch
+                # too much according to the contents, and this is bad with long file names.
+                $self->{object_info_choice} = Wx::Choice->new($self, -1, wxDefaultPosition, [100,-1], []);
+                $self->{object_info_choice}->SetFont($Slic3r::GUI::small_font);
+                $sizer->Add($self->{object_info_choice}, 1, wxALIGN_CENTER_VERTICAL);
+                
+                EVT_CHOICE($self, $self->{object_info_choice}, sub {
+                    $self->select_object($self->{object_info_choice}->GetSelection);
+                    $self->refresh_canvases;
+                });
+            }
+            
             my $grid_sizer = Wx::FlexGridSizer->new(3, 4, 5, 5);
             $grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
             $grid_sizer->AddGrowableCol(1, 1);
@@ -384,6 +409,7 @@ sub new {
             $object_info_sizer->Add($grid_sizer, 0, wxEXPAND);
             
             my @info = (
+                copies      => "Copies",
                 size        => "Size",
                 volume      => "Volume",
                 facets      => "Facets",
@@ -436,7 +462,7 @@ sub new {
                 $self->{"print_info_$field"}->SetFont($Slic3r::GUI::small_font);
                 $grid_sizer->Add($self->{"print_info_$field"}, 0);
             }
-            $self->{"sliced_info_box"} = $print_info_sizer;
+            $self->{sliced_info_box} = $print_info_sizer;
             
         }
         
@@ -447,14 +473,13 @@ sub new {
         $buttons_sizer->Add($self->{btn_send_gcode}, 0, wxALIGN_RIGHT, 0);
         $buttons_sizer->Add($self->{btn_export_gcode}, 0, wxALIGN_RIGHT, 0);
         
-        my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
+        $self->{right_sizer} = my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
         $right_sizer->Add($presets, 0, wxEXPAND | wxTOP, 10) if defined $presets;
         $right_sizer->Add($buttons_sizer, 0, wxEXPAND | wxBOTTOM, 5);
-        $right_sizer->Add($self->{list}, 1, wxEXPAND, 5);
+        $right_sizer->Add($self->{settings_override_panel}, 1, wxEXPAND, 5);
         $right_sizer->Add($object_info_sizer, 0, wxEXPAND, 0);
         $right_sizer->Add($print_info_sizer, 0, wxEXPAND, 0);
         $right_sizer->Hide($print_info_sizer);
-        $self->{"right_sizer"} = $right_sizer;
         
         my $hsizer = Wx::BoxSizer->new(wxHORIZONTAL);
         $hsizer->Add($self->{preview_notebook}, 1, wxEXPAND | wxTOP, 1);
@@ -469,34 +494,116 @@ sub new {
         $self->SetSizer($sizer);
     }
     
+    $self->load_presets;
+    $self->_on_select_preset($_) for qw(printer filament print);
+    
     return $self;
 }
 
-# sets the callback
-sub on_select_preset {
-    my ($self, $cb) = @_;
-    $self->{on_select_preset} = $cb;
+sub prompt_unsaved_changes {
+    my ($self) = @_;
+    
+    foreach my $group (qw(printer filament print)) {
+        foreach my $choice (@{$self->{preset_choosers}{$group}}) {
+            my $pp = $self->{preset_choosers_names}{$choice};
+            for my $i (0..$#$pp) {
+                my $preset = first { $_->name eq $pp->[$i] } @{wxTheApp->presets->{$group}};
+                if (!$preset->prompt_unsaved_changes($self)) {
+                    # Restore the previous one
+                    $choice->SetSelection($i);
+                    return 0;
+                }
+            }
+        }
+    }
+    return 1;
+}
+
+sub _on_change_combobox {
+    my ($self, $group, $choice) = @_;
+    
+    if (0) {
+        # This code is disabled because wxPerl doesn't provide GetCurrentSelection
+        my $current_name = $self->{preset_choosers_names}{$choice}[$choice->GetCurrentSelection];
+        my $current = first { $_->name eq $current_name } @{wxTheApp->presets->{$group}};
+        if (!$current->prompt_unsaved_changes($self)) {
+            # Restore the previous one
+            $choice->SetSelection($choice->GetCurrentSelection);
+            return;
+        }
+    } else {
+        return 0 if !$self->prompt_unsaved_changes;
+    }
+    wxTheApp->CallAfter(sub {
+        $self->_on_select_preset($group);
+        
+        # This will remove the "(modified)" mark from any dirty preset handled here.
+        $self->load_presets;
+    });
 }
 
 sub _on_select_preset {
-	my $self = shift;
-	my ($group, $choice) = @_;
+	my ($self, $group) = @_;
 	
-	# if user changed filament preset, don't propagate this to the tabs
-	if ($group eq 'filament' && @{$self->{preset_choosers}{filament}} > 1) {
-		my @filament_presets = $self->filament_presets;
-		$Slic3r::GUI::Settings->{presets}{filament} = $choice->GetString($filament_presets[0]) . ".ini";
-		$Slic3r::GUI::Settings->{presets}{"filament_${_}"} = $choice->GetString($filament_presets[$_])
-			for 1 .. $#filament_presets;
-		wxTheApp->save_settings;
-	} else {
-        # call GetSelection() in scalar context as it's context-aware
-        $self->{on_select_preset}->($group, scalar $choice->GetSelection)
-            if $self->{on_select_preset};
-	}
+	my @presets = $self->selected_presets($group);
 	
-	# generate on_config_change() event for updating plater and other things
-	$self->on_config_change();
+	my $s_presets = $Slic3r::GUI::Settings->{presets};
+	my $changed = !$s_presets->{$group} || $s_presets->{$group} ne $presets[0]->name;
+    $s_presets->{$group} = $presets[0]->name;
+    $s_presets->{"${group}_${_}"} = $presets[$_]->name for 1..$#presets;
+	
+	wxTheApp->save_settings;
+	
+	my $config = $self->config;
+	
+	$self->on_extruders_change(scalar @{$config->get('nozzle_diameter')});
+    
+    if ($group eq 'print') {
+        my $o_config = $self->{settings_override_config};
+        my $o_panel  = $self->{settings_override_panel};
+        
+        if ($changed) {
+            # Preserve current options if re-selecting the same preset
+            $o_config->clear;
+        }
+        
+        my $overridable = $config->get('overridable');
+        
+        # Add/remove options (we do it this way for preserving current options)
+        foreach my $opt_key (@$overridable) {
+            if (!$o_config->has($opt_key)) {
+                # Populate option with the default value taken from configuration
+                $o_config->set($opt_key, $config->get($opt_key));
+            }
+        }
+        foreach my $opt_key (@{$o_config->get_keys}) {
+            # Keep options listed among overridable and options added on the fly
+            if ((none { $_ eq $opt_key } @$overridable)
+                && (any { $_ eq $opt_key } $o_panel->fixed_options)) {
+                $o_config->erase($opt_key);
+            }
+        }
+        
+        $o_panel->set_default_config($config);
+        $o_panel->set_fixed_options(\@$overridable);
+        $o_panel->update_optgroup;
+    } elsif ($group eq 'printer') {
+        # reload print and filament settings to honor their compatible_printer options
+        $self->load_presets;
+    }
+    
+    $self->config_changed;
+}
+
+sub load_config {
+    my ($self, $config) = @_;
+    
+    # This method is called with the CLI options.
+    # We add them to the visible overrides.
+    $self->{settings_override_config}->apply($config);
+    $self->{settings_override_panel}->update_optgroup;
+    
+    $self->config_changed;
 }
 
 sub GetFrame {
@@ -504,60 +611,186 @@ sub GetFrame {
     return &Wx::GetTopLevelParent($self);
 }
 
-sub update_presets {
-    my $self = shift;
-    my ($group, $presets, $selected, $is_dirty) = @_;
+sub load_presets {
+    my ($self) = @_;
     
-    my @choosers = @{ $self->{preset_choosers}{$group} };
-    foreach my $choice (@choosers) {
-        if ($group eq 'filament' && @choosers > 1) {
-            # if we have more than one filament chooser, keep our selection
-            # instead of importing the one from the tab
-            $selected = $choice->GetSelection;
-            $is_dirty = 0;
-        }
-        $choice->Clear;
-        foreach my $preset (@$presets) {
-            my $bitmap;
-            if ($group eq 'filament') {
-                my $config = $preset->config(['filament_colour']);
-                my $rgb_hex = $config->filament_colour->[0];
-                if ($preset->default) {
-                    $bitmap = Wx::Bitmap->new($Slic3r::var->("spool.png"), wxBITMAP_TYPE_PNG);
-                } else {
-                    $rgb_hex =~ s/^#//;
-                    my @rgb = unpack 'C*', pack 'H*', $rgb_hex;
-                    my $image = Wx::Image->new(16,16);
-                    $image->SetRGB(Wx::Rect->new(0,0,16,16), @rgb);
-                    $bitmap = Wx::Bitmap->new($image);
+    my $selected_printer_name;
+    foreach my $group (qw(printer filament print)) {
+        my @presets = @{wxTheApp->presets->{$group}};
+        
+        # Skip presets not compatible with the selected printer, if they
+        # have other compatible printers configured (and at least one of them exists).
+        if ($group eq 'filament' || $group eq 'print') {
+            my %printer_names = map { $_->name => 1 } @{ wxTheApp->presets->{printer} };
+            for (my $i = 0; $i <= $#presets; ++$i) {
+                my $config = $presets[$i]->dirty_config;
+                next if !$config->has('compatible_printers');
+                my @compat = @{$config->compatible_printers};
+                if (@compat
+                    && (none { $_ eq $selected_printer_name } @compat)
+                    && (any { $printer_names{$_} } @compat)) {
+                    splice @presets, $i, 1;
+                    --$i;
                 }
-            } elsif ($group eq 'print') {
-                $bitmap = Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG);
-            } elsif ($group eq 'printer') {
-                $bitmap = Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG);
             }
-            $choice->AppendString($preset->name, $bitmap);
         }
         
-        if ($selected <= $#$presets) {
-            my $preset_name = $choice->GetString($selected);
-            if ($is_dirty) {
-                $choice->SetString($selected, "$preset_name (modified)");
+        # Only show the default presets if we have no other presets.
+        if (@presets > 1) {
+            @presets = grep { !$_->default } @presets;
+        }
+        
+        # get the wxChoice objects for this group
+        my @choosers = @{ $self->{preset_choosers}{$group} };
+        
+        # find the currently selected one(s) according to the saved file
+        my @sel = ();
+        if (my $current = $Slic3r::GUI::Settings->{presets}{$group}) {
+            push @sel, grep defined, first { $presets[$_]->name eq $current } 0..$#presets;
+        }
+        for my $i (1..(@choosers-1)) {
+            if (my $current = $Slic3r::GUI::Settings->{presets}{"${group}_$i"}) {
+                push @sel, grep defined, first { $presets[$_]->name eq $current } 0..$#presets;
+            }
+        }
+        @sel = (0) if !@sel;
+        
+        # populate the wxChoice objects
+        foreach my $choice (@choosers) {
+            $choice->Clear;
+            $self->{preset_choosers_names}{$choice} = [];
+            foreach my $preset (@presets) {
+                # load/generate the proper icon
+                my $bitmap;
+                if ($group eq 'filament') {
+                    my $config = $preset->dirty_config;
+                    if ($preset->default || !$config->has('filament_colour')) {
+                        $bitmap = Wx::Bitmap->new($Slic3r::var->("spool.png"), wxBITMAP_TYPE_PNG);
+                    } else {
+                        my $rgb_hex = $config->filament_colour->[0];
+                    
+                        $rgb_hex =~ s/^#//;
+                        my @rgb = unpack 'C*', pack 'H*', $rgb_hex;
+                        my $image = Wx::Image->new(16,16);
+                        $image->SetRGB(Wx::Rect->new(0,0,16,16), @rgb);
+                        $bitmap = Wx::Bitmap->new($image);
+                    }
+                } elsif ($group eq 'print') {
+                    $bitmap = Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG);
+                } elsif ($group eq 'printer') {
+                    $bitmap = Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG);
+                }
+                $choice->AppendString($preset->dropdown_name, $bitmap);
+                push @{$self->{preset_choosers_names}{$choice}}, $preset->name;
+            }
+            
+            my $selected = shift @sel;
+            if (defined $selected && $selected <= $#presets) {
+                # call SetSelection() only after SetString() otherwise the new string
+                # won't be picked up as the visible string
+                $choice->SetSelection($selected);
+                
+                my $preset_name = $self->{preset_choosers_names}{$choice}[$selected];
+                $self->{print}->placeholder_parser->set("${group}_preset", $preset_name);
+                # TODO: populate other filament preset placeholders
+                $selected_printer_name = $preset_name if $group eq 'printer';
             }
-            # call SetSelection() only after SetString() otherwise the new string
-            # won't be picked up as the visible string
-            $choice->SetSelection($selected);
-	
-            $self->{print}->placeholder_parser->set("${group}_preset", $preset_name);
         }
     }
 }
 
-sub filament_presets {
-    my $self = shift;
+sub select_preset_by_name {
+    my ($self, $name, $group, $n) = @_;
     
-    # force scalar context for GetSelection() as it's context-aware
-    return map scalar($_->GetSelection), @{ $self->{preset_choosers}{filament} };
+    # $n is optional
+    
+    my $presets = wxTheApp->presets->{$group};
+    my $choosers = $self->{preset_choosers}{$group};
+    my $names = $self->{preset_choosers_names}{$choosers->[0]};
+    my $i = first { $names->[$_] eq $name } 0..$#$names;
+    return if !defined $i;
+    
+    if (defined $n && $n <= $#$choosers) {
+        $choosers->[$n]->SetSelection($i);
+    } else {
+        $_->SetSelection($i) for @$choosers;
+    }
+    $self->_on_select_preset($group);
+}
+
+sub selected_presets {
+    my ($self, $group) = @_;
+    
+    my %presets = ();
+    foreach my $group (qw(printer filament print)) {
+        $presets{$group} = [];
+        foreach my $choice (@{$self->{preset_choosers}{$group}}) {
+            my $sel = $choice->GetSelection;
+            $sel = 0 if $sel == -1;
+            push @{ $presets{$group} },
+                grep { $_->name eq $self->{preset_choosers_names}{$choice}[$sel] }
+                @{wxTheApp->presets->{$group}};
+        }
+    }
+    return $group ? @{$presets{$group}} : %presets;
+}
+
+sub show_preset_editor {
+    my ($self, $group, $i) = @_;
+    
+    my $class = "Slic3r::GUI::PresetEditorDialog::" . ucfirst($group);
+    my $dlg = $class->new($self);
+    
+    my @presets = $self->selected_presets($group);
+    $dlg->preset_editor->select_preset_by_name($presets[$i // 0]->name);
+    $dlg->ShowModal;
+    
+    # Re-load the presets as they might have changed.
+    $self->load_presets;
+    
+    # Select the preset that was last selected in the editor.
+    $self->select_preset_by_name
+        ($dlg->preset_editor->current_preset->name, $group, $i, 1);
+}
+
+# Returns the current config by merging the selected presets and the overrides.
+sub config {
+    my ($self) = @_;
+    
+    # use a DynamicConfig because FullPrintConfig is not enough
+    my $config = Slic3r::Config->new_from_defaults;
+    
+    # get defaults also for the values tracked by the Plater's config
+    # (for example 'overridable')
+    $config->apply(Slic3r::Config->new_from_defaults(@{$self->{config}->get_keys}));
+    
+    my %classes = map { $_ => "Slic3r::GUI::PresetEditor::".ucfirst($_) }
+        qw(print filament printer);
+    
+    my %presets = $self->selected_presets;
+    $config->apply($_->dirty_config) for @{ $presets{printer} };
+    if (@{ $presets{filament} }) {
+        my $filament_config = $presets{filament}[0]->dirty_config;
+        
+        for my $i (1..$#{ $presets{filament} }) {
+            my $preset = $presets{filament}[$i];
+            my $config = $preset->dirty_config;
+            foreach my $opt_key (@{$config->get_keys}) {
+                if ($filament_config->has($opt_key)) {
+                    my $value = $filament_config->get($opt_key);
+                    next unless ref $value eq 'ARRAY';
+                    $value->[$i] = $config->get($opt_key)->[0];
+                    $filament_config->set($opt_key, $value);
+                }
+            }
+        }
+        
+        $config->apply($filament_config);
+    }
+    $config->apply($_->dirty_config) for @{ $presets{print} };
+    $config->apply($self->{settings_override_config});
+    
+    return $config;
 }
 
 sub add {
@@ -703,18 +936,7 @@ sub load_model_objects {
         );
     }
     
-    foreach my $obj_idx (@obj_idx) {
-        my $object = $self->{objects}[$obj_idx];
-        my $model_object = $self->{model}->objects->[$obj_idx];
-        $self->{list}->InsertStringItem($obj_idx, $object->name);
-        $self->{list}->SetItemFont($obj_idx, Wx::Font->new(10, wxDEFAULT, wxNORMAL, wxNORMAL))
-            if $self->{list}->can('SetItemFont');  # legacy code for wxPerl < 0.9918 not supporting SetItemFont()
-    
-        $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
-        $self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%");
-    
-        $self->make_thumbnail($obj_idx);
-    }
+    $self->make_thumbnail($_) for @obj_idx;
     $self->arrange if $need_arrange;
     $self->on_model_change;
     
@@ -722,8 +944,6 @@ sub load_model_objects {
     $self->{canvas3D}->zoom_to_volumes
         if $self->{canvas3D};
     
-    $self->{list}->Update;
-    $self->{list}->Select($obj_idx[-1], 1);
     $self->object_list_changed;
     
     return @obj_idx;
@@ -755,7 +975,6 @@ sub remove {
     splice @{$self->{objects}}, $obj_idx, 1;
     $self->{model}->delete_object($obj_idx);
     $self->{print}->delete_object($obj_idx);
-    $self->{list}->DeleteItem($obj_idx);
     $self->object_list_changed;
     
     $self->select_object(undef);
@@ -774,7 +993,6 @@ sub reset {
     @{$self->{objects}} = ();
     $self->{model}->clear_objects;
     $self->{print}->clear_objects;
-    $self->{list}->DeleteAllItems;
     $self->object_list_changed;
     
     $self->select_object(undef);
@@ -796,7 +1014,6 @@ sub increase {
         );
         $self->{print}->objects->[$obj_idx]->add_copy($instance->offset);
     }
-    $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
     
     # only autoarrange if user has autocentering enabled
     $self->stop_background_process;
@@ -820,15 +1037,10 @@ sub decrease {
             $model_object->delete_last_instance;
             $self->{print}->objects->[$obj_idx]->delete_last_copy;
         }
-        $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
     } else {
         $self->remove;
     }
     
-    if ($self->{objects}[$obj_idx]) {
-        $self->{list}->Select($obj_idx, 0);
-        $self->{list}->Select($obj_idx, 1);
-    }
     $self->on_model_change;
 }
 
@@ -991,8 +1203,8 @@ sub changescale {
                 $model_instance->scaling_factor*100, $self);
             return if !$scale || $scale !~ /^\d*(?:\.\d*)?$/ || $scale < 0;
         }
-    
-        $self->{list}->SetItem($obj_idx, 2, "$scale%");
+        return if !$scale || $scale < 0;
+        
         $scale /= 100;  # turn percent into factor
         
         my $variation = $scale / $model_instance->scaling_factor;
@@ -1019,7 +1231,7 @@ sub arrange {
     $self->pause_background_process;
     
     my $bb = Slic3r::Geometry::BoundingBoxf->new_from_points($self->{config}->bed_shape);
-    my $success = $self->{model}->arrange_objects($self->GetFrame->config->min_object_distance, $bb);
+    my $success = $self->{model}->arrange_objects($self->config->min_object_distance, $bb);
     # ignore arrange failures on purpose: user has visual feedback and we don't need to warn him
     # when parts don't fit in print bed
     
@@ -1070,6 +1282,70 @@ sub split_object {
     $self->load_model_objects(@model_objects);
 }
 
+sub toggle_print_stats {
+    my ($self, $show) = @_;
+    
+    return if !$self->GetFrame->is_loaded;
+    
+    if ($show) {
+        $self->{right_sizer}->Show($self->{sliced_info_box});
+    } else {
+        $self->{right_sizer}->Hide($self->{sliced_info_box});
+    }
+    $self->{right_sizer}->Layout;
+}
+
+sub config_changed {
+    my $self = shift;
+    
+    my $config = $self->config;
+    
+    if ($Slic3r::GUI::autosave) {
+        $config->save($Slic3r::GUI::autosave);
+    }
+    
+    # Apply changes to the plater-specific config options.
+    foreach my $opt_key (@{$self->{config}->diff($config)}) {
+	    # Ignore overrides. No need to set them in our config; we'll use them directly below.
+	    next if $opt_key eq 'overrides';
+	    
+        $self->{config}->set($opt_key, $config->get($opt_key));
+        
+        if ($opt_key eq 'bed_shape') {
+            $self->{canvas}->update_bed_size;
+            $self->{canvas3D}->update_bed_size if $self->{canvas3D};
+            $self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
+                if $self->{preview3D};
+            $self->on_model_change;
+        } elsif ($opt_key eq 'serial_port') {
+            if ($config->get('serial_port')) {
+                $self->{btn_print}->Show;
+            } else {
+                $self->{btn_print}->Hide;
+            }
+            $self->Layout;
+        } elsif ($opt_key eq 'octoprint_host') {
+            if ($config->get('octoprint_host')) {
+                $self->{btn_send_gcode}->Show;
+            } else {
+                $self->{btn_send_gcode}->Hide;
+            }
+            $self->Layout;
+        }
+    }
+    
+    return if !$self->GetFrame->is_loaded;
+    
+    $self->toggle_print_stats(0);
+    
+    if ($Slic3r::GUI::Settings->{_}{background_processing}) {
+        # (re)start timer
+        $self->schedule_background_process;
+    } else {
+        $self->async_apply_config;
+    }
+}
+
 sub schedule_background_process {
     my ($self) = @_;
     
@@ -1093,7 +1369,7 @@ sub async_apply_config {
     $self->pause_background_process;
     
     # apply new config
-    my $invalidated = $self->{print}->apply_config($self->GetFrame->config);
+    my $invalidated = $self->{print}->apply_config($self->config);
     
     # reset preview canvases (invalidated contents will be hidden)
     $self->{toolpaths2D}->reload_print if $self->{toolpaths2D};
@@ -1108,10 +1384,7 @@ sub async_apply_config {
         # kill current thread if any
         $self->stop_background_process;
         # remove the sliced statistics box because something changed.
-        if ($self->{"right_sizer"}) { 
-            $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
-            $self->{"right_sizer"}->Layout;
-        }
+        $self->toggle_print_stats(0);
     } else {
         $self->resume_background_process;
     }
@@ -1124,9 +1397,13 @@ sub start_background_process {
     my ($self) = @_;
     
     return if !$Slic3r::have_threads;
-    return if !@{$self->{objects}};
     return if $self->{process_thread};
     
+    if (!@{$self->{objects}}) {
+        $self->on_process_completed;
+        return;
+    }
+    
     # It looks like declaring a local $SIG{__WARN__} prevents the ugly
     # "Attempt to free unreferenced scalar" warning...
     local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
@@ -1134,7 +1411,7 @@ sub start_background_process {
     # don't start process thread if config is not valid
     eval {
         # this will throw errors if config is not valid
-        $self->GetFrame->config->validate;
+        $self->config->validate;
         $self->{print}->validate;
     };
     if ($@) {
@@ -1226,14 +1503,14 @@ sub export_gcode {
     # (we assume that if it is running, config is valid)
     eval {
         # this will throw errors if config is not valid
-        $self->GetFrame->config->validate;
+        $self->config->validate;
         $self->{print}->validate;
     };
     Slic3r::GUI::catch_error($self) and return;
     
     
     # apply config and validate print
-    my $config = $self->GetFrame->config;
+    my $config = $self->config;
     eval {
         # this will throw errors if config is not valid
         $config->validate;
@@ -1289,8 +1566,7 @@ sub export_gcode {
     
     # this updates buttons status
     $self->object_list_changed;
-    $self->{"right_sizer"}->Show($self->{"sliced_info_box"});
-    $self->{"right_sizer"}->Layout;
+    $self->toggle_print_stats(1);
     
     return $self->{export_gcode_output_file};
 }
@@ -1409,15 +1685,15 @@ sub on_export_completed {
 sub do_print {
     my ($self) = @_;
     
-    my $printer_tab = $self->GetFrame->{options_tabs}{printer};
-    my $printer_name = $printer_tab->get_current_preset->name;
+    my $controller = $self->GetFrame->{controller} or return;
     
-    my $controller = $self->GetFrame->{controller};
-    my $printer_panel = $controller->add_printer($printer_name, $printer_tab->config);
+    my %current_presets = $self->selected_presets;
+    
+    my $printer_name = $current_presets{printer}->[0]->name;
+    my $printer_panel = $controller->add_printer($printer_name, $self->config);
     
     my $filament_stats = $self->{print}->filament_stats;
-    my @filament_names = $self->GetFrame->filament_preset_names;
-    $filament_stats = { map { $filament_names[$_] => $filament_stats->{$_} } keys %$filament_stats };
+    $filament_stats = { map { $current_presets{filament}[$_]->name => $filament_stats->{$_} } keys %$filament_stats };
     $printer_panel->load_print_job($self->{print_file}, $filament_stats);
     
     $self->GetFrame->select_tab(1);
@@ -1654,6 +1930,38 @@ sub on_thumbnail_made {
 sub on_model_change {
     my ($self, $force_autocenter) = @_;
     
+    # reload the select submenu (if already initialized)
+    if (my $menu = $self->GetFrame->{plater_select_menu}) {
+        $menu->DeleteItem($_) for $menu->GetMenuItems;
+        for my $i (0..$#{$self->{objects}}) {
+            my $name = $self->{objects}->[$i]->name;
+            my $count = $self->{model}->get_object($i)->instances_count;
+            if ($count > 1) {
+                $name .= " (${count}x)";
+            }
+            my $item = $self->GetFrame->_append_menu_item($menu, $name, 'Select object', sub {
+                $self->select_object($i);
+                $self->refresh_canvases;
+            }, undef, undef, wxITEM_CHECK);
+            $item->Check(1) if $self->{objects}->[$i]->selected;
+        }
+    }
+    
+    # reload the objects info choice
+    if (my $choice = $self->{object_info_choice}) {
+        $choice->Clear;
+        for my $i (0..$#{$self->{objects}}) {
+            my $name = $self->{objects}->[$i]->name;
+            my $count = $self->{model}->get_object($i)->instances_count;
+            if ($count > 1) {
+                $name .= " (${count}x)";
+            }
+            $choice->Append($name);
+        }
+        my ($obj_idx, $object) = $self->selected_object;
+        $choice->SetSelection($obj_idx // -1);
+    }
+    
     my $running = $self->pause_background_process;
     
     if ($Slic3r::GUI::Settings->{_}{autocenter} || $force_autocenter) {
@@ -1670,10 +1978,7 @@ sub on_model_change {
             # failed upon previous instance move, so we have no running thread and no steps
             # are invalidated on this move, thus we need to schedule a new run.
             $self->schedule_background_process;
-            if ($self->{"right_sizer"}) { 
-                $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
-                $self->{"right_sizer"}->Layout;
-            }
+            $self->toggle_print_stats(0);
         } else {
             $self->resume_background_process;
         }
@@ -1707,18 +2012,27 @@ sub on_extruders_change {
         # copy icons from first choice
         $choice->SetItemBitmap($_, $choices->[0]->GetItemBitmap($_)) for 0..$#presets;
         
-        # insert new choice into sizer
-        $self->{presets_sizer}->Insert(4 + ($#$choices-1)*2, 0, 0);
-        $self->{presets_sizer}->Insert(5 + ($#$choices-1)*2, $choice, 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
+        # settings button
+        my $settings_btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG), 
+            wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
         
-        # setup the listener
+        # insert new row into sizer
+        $self->{presets_sizer}->Insert(6 + ($#$choices-1)*3, 0, 0);
+        $self->{presets_sizer}->Insert(7 + ($#$choices-1)*3, $choice, 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
+        $self->{presets_sizer}->Insert(8 + ($#$choices-1)*3, $settings_btn, 0, wxEXPAND | wxLEFT, 4);
+        
+        # setup the listeners
         EVT_COMBOBOX($choice, $choice, sub {
             my ($choice) = @_;
             wxTheApp->CallAfter(sub {
-                $self->_on_select_preset('filament', $choice);
+                $self->_on_change_combobox('filament', $choice);
             });
         });
         
+        EVT_BUTTON($self, $settings_btn, sub {
+            $self->show_preset_editor('filament', $#$choices);
+        });
+        
         # initialize selection
         my $i = first { $choice->GetString($_) eq ($Slic3r::GUI::Settings->{presets}{"filament_" . $#$choices} || '') } 0 .. $#presets;
         $choice->SetSelection($i || 0);
@@ -1726,90 +2040,21 @@ sub on_extruders_change {
     
     # remove unused choices if any
     while (@$choices > $num_extruders) {
-        $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2);  # label
-        $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2);  # wxChoice
+        my $i = 6 + ($#$choices-1)*3;
+        
+        $self->{presets_sizer}->Remove($i);  # label
+        $self->{presets_sizer}->Remove($i);  # wxChoice
+        
+        my $settings_btn = $self->{presets_sizer}->GetItem($i)->GetWindow;
+        $self->{presets_sizer}->Remove($i);  # settings btn
+        $settings_btn->Destroy;
+        
         $choices->[-1]->Destroy;
         pop @$choices;
     }
     $self->Layout;
 }
 
-sub on_config_change {
-    my $self = shift;
-    
-    my $config = $self->GetFrame->config;
-    
-    if ($Slic3r::GUI::autosave) {
-        $config->save($Slic3r::GUI::autosave);
-    }
-    
-    # Apply changes to the plater-specific config options.
-    foreach my $opt_key (@{$self->{config}->diff($config)}) {
-        $self->{config}->set($opt_key, $config->get($opt_key));
-        if ($opt_key eq 'bed_shape') {
-            $self->{canvas}->update_bed_size;
-            $self->{canvas3D}->update_bed_size if $self->{canvas3D};
-            $self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
-                if $self->{preview3D};
-            $self->on_model_change;
-        } elsif ($opt_key eq 'serial_port') {
-            if ($config->get('serial_port')) {
-                $self->{btn_print}->Show;
-            } else {
-                $self->{btn_print}->Hide;
-            }
-            $self->Layout;
-        } elsif ($opt_key eq 'octoprint_host') {
-            if ($config->get('octoprint_host')) {
-                $self->{btn_send_gcode}->Show;
-            } else {
-                $self->{btn_send_gcode}->Hide;
-            }
-            $self->Layout;
-        }
-    }
-    
-    if ($self->{"right_sizer"}) { 
-        $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
-        $self->{"right_sizer"}->Layout;
-    }
-    
-    return if !$self->GetFrame->is_loaded;
-    
-    if ($Slic3r::GUI::Settings->{_}{background_processing}) {
-        # (re)start timer
-        $self->schedule_background_process;
-    } else {
-        $self->async_apply_config;
-    }
-}
-
-sub list_item_deselected {
-    my ($self, $event) = @_;
-    return if $PreventListEvents;
-    
-    if ($self->{list}->GetFirstSelected == -1) {
-        $self->select_object(undef);
-        $self->refresh_canvases;
-    }
-}
-
-sub list_item_selected {
-    my ($self, $event) = @_;
-    return if $PreventListEvents;
-    
-    my $obj_idx = $event->GetIndex;
-    $self->select_object($obj_idx);
-    $self->refresh_canvases;
-}
-
-sub list_item_activated {
-    my ($self, $event, $obj_idx) = @_;
-    
-    $obj_idx //= $event->GetIndex;
-	$self->object_settings_dialog($obj_idx);
-}
-
 sub object_cut_dialog {
     my $self = shift;
     my ($obj_idx) = @_;
@@ -1905,6 +2150,13 @@ sub selection_changed {
     my ($obj_idx, $object) = $self->selected_object;
     my $have_sel = defined $obj_idx;
     
+    if (my $menu = $self->GetFrame->{plater_select_menu}) {
+        $_->Check(0) for $menu->GetMenuItems;
+        if ($have_sel) {
+            $menu->FindItemByPosition($obj_idx)->Check(1);
+        }
+    }
+    
     my $method = $have_sel ? 'Enable' : 'Disable';
     $self->{"btn_$_"}->$method
         for grep $self->{"btn_$_"}, qw(remove increase decrease rotate45cw rotate45ccw changescale split cut settings);
@@ -1915,10 +2167,19 @@ sub selection_changed {
     }
     
     if ($self->{object_info_size}) { # have we already loaded the info pane?
+        
         if ($have_sel) {
             my $model_object = $self->{model}->objects->[$obj_idx];
+            $self->{object_info_choice}->SetSelection($obj_idx);
+            $self->{object_info_copies}->SetLabel($model_object->instances_count);
             my $model_instance = $model_object->instances->[0];
-            $self->{object_info_size}->SetLabel(sprintf("%.2f x %.2f x %.2f", @{$model_object->instance_bounding_box(0)->size}));
+            {
+                my $size_string = sprintf "%.2f x %.2f x %.2f", @{$model_object->instance_bounding_box(0)->size};
+                if ($model_instance->scaling_factor != 1) {
+                    $size_string .= sprintf " (%s%%)", $model_instance->scaling_factor * 100;
+                }
+                $self->{object_info_size}->SetLabel($size_string);
+            }
             $self->{object_info_materials}->SetLabel($model_object->materials_count);
             
             my $raw_mesh = $model_object->raw_mesh;
@@ -1943,7 +2204,8 @@ sub selection_changed {
                 $self->{object_info_facets}->SetLabel($object->facets);
             }
         } else {
-            $self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold);
+            $self->{object_info_choice}->SetSelection(-1);
+            $self->{"object_info_$_"}->SetLabel("") for qw(copies size volume facets materials manifold);
             $self->{object_info_manifold_warning_icon}->Hide;
             $self->{object_info_manifold}->SetToolTipString("");
         }
@@ -1960,15 +2222,6 @@ sub select_object {
     $_->selected(0) for @{ $self->{objects} };
     if (defined $obj_idx) {
         $self->{objects}->[$obj_idx]->selected(1);
-        
-        # We use this flag to avoid circular event handling
-        # Select() happens to fire a wxEVT_LIST_ITEM_SELECTED on Windows, 
-        # whose event handler calls this method again and again and again
-        $PreventListEvents = 1;
-        $self->{list}->Select($obj_idx, 1);
-        $PreventListEvents = 0;
-    } else {
-        # TODO: deselect all in list
     }
     $self->selection_changed(1);
 }
@@ -1993,7 +2246,7 @@ sub validate_config {
     my $self = shift;
     
     eval {
-        $self->GetFrame->config->validate;
+        $self->config->validate;
     };
     return 0 if Slic3r::GUI::catch_error($self);    
     return 1;
@@ -2031,7 +2284,7 @@ sub object_menu {
     
     my $rotateMenu = Wx::Menu->new;
     my $rotateMenuItem = $menu->AppendSubMenu($rotateMenu, "Rotate", 'Rotate the selected object by an arbitrary angle');
-    $frame->_set_menu_item_icon($rotateMenuItem, 'textfield.png');
+    wxTheApp->set_menu_item_icon($rotateMenuItem, 'textfield.png');
     $frame->_append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub {
         $self->rotate(undef, X);
     }, undef, 'bullet_red.png');
@@ -2044,7 +2297,7 @@ sub object_menu {
     
     my $mirrorMenu = Wx::Menu->new;
     my $mirrorMenuItem = $menu->AppendSubMenu($mirrorMenu, "Mirror", 'Mirror the selected object');
-    $frame->_set_menu_item_icon($mirrorMenuItem, 'shape_flip_horizontal.png');
+    wxTheApp->set_menu_item_icon($mirrorMenuItem, 'shape_flip_horizontal.png');
     $frame->_append_menu_item($mirrorMenu, "Along X axis…", 'Mirror the selected object along the X axis', sub {
         $self->mirror(X);
     }, undef, 'bullet_red.png');
@@ -2057,7 +2310,7 @@ sub object_menu {
     
     my $scaleMenu = Wx::Menu->new;
     my $scaleMenuItem = $menu->AppendSubMenu($scaleMenu, "Scale", 'Scale the selected object along a single axis');
-    $frame->_set_menu_item_icon($scaleMenuItem, 'arrow_out.png');
+    wxTheApp->set_menu_item_icon($scaleMenuItem, 'arrow_out.png');
     $frame->_append_menu_item($scaleMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub {
         $self->changescale(undef);
     });
@@ -2073,7 +2326,7 @@ sub object_menu {
     
     my $scaleToSizeMenu = Wx::Menu->new;
     my $scaleToSizeMenuItem = $menu->AppendSubMenu($scaleToSizeMenu, "Scale to size", 'Scale the selected object along a single axis');
-    $frame->_set_menu_item_icon($scaleToSizeMenuItem, 'arrow_out.png');
+    wxTheApp->set_menu_item_icon($scaleToSizeMenuItem, 'arrow_out.png');
     $frame->_append_menu_item($scaleToSizeMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub {
         $self->changescale(undef, 1);
     });
diff --git a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
index e848b76389..8e5e6b52b6 100644
--- a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
+++ b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
@@ -1,5 +1,4 @@
-# Included in ObjectSettingsDialog -> ObjectPartsPanel.
-# Maintains, displays, adds and removes overrides of slicing parameters for an object and its modifier mesh.
+# Maintains, displays, adds and removes overrides of slicing parameters.
 
 package Slic3r::GUI::Plater::OverrideSettingsPanel;
 use strict;
@@ -16,13 +15,26 @@ use constant ICON_MATERIAL      => 0;
 use constant ICON_SOLIDMESH     => 1;
 use constant ICON_MODIFIERMESH  => 2;
 
+my %icons = (
+    'Advanced'              => 'wand.png',
+    'Extruders'             => 'funnel.png',
+    'Extrusion Width'       => 'funnel.png',
+    'Infill'                => 'infill.png',
+    'Layers and Perimeters' => 'layers.png',
+    'Skirt and brim'        => 'box.png',
+    'Speed'                 => 'time.png',
+    'Speed > Acceleration'  => 'time.png',
+    'Support material'      => 'building.png',
+);
+
 sub new {
     my $class = shift;
     my ($parent, %params) = @_;
-    my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+    my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, $params{size} // wxDefaultSize, wxTAB_TRAVERSAL);
     $self->{default_config} = Slic3r::Config->new;
     $self->{config} = Slic3r::Config->new;
     $self->{on_change} = $params{on_change};
+    $self->{editable} = 1;
     $self->{fixed_options} = {};
     
     $self->{sizer} = Wx::BoxSizer->new(wxVERTICAL);
@@ -35,15 +47,31 @@ sub new {
         # create the button
         my $btn = $self->{btn_add} = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("add.png"), wxBITMAP_TYPE_PNG),
             wxDefaultPosition, wxDefaultSize, Wx::wxBORDER_NONE);
+        $btn->SetToolTipString("Override one more option")
+            if $btn->can('SetToolTipString');
         EVT_LEFT_DOWN($btn, sub {
             my $menu = Wx::Menu->new;
+            my $last_cat = '';
             foreach my $opt_key (@{$self->{options}}) {
                 my $id = &Wx::NewId();
-                $menu->Append($id, $self->{option_labels}{$opt_key});
+                
+                # add icon, if we have one for this category
+                my $icon;
+                if (my $cat = $Slic3r::Config::Options->{$opt_key}{category}) {
+                    if ($last_cat && $cat ne $last_cat) {
+                        $menu->AppendSeparator;
+                    }
+                    $last_cat = $cat;
+                    $icon = $icons{$cat};
+                }
+                
+                my $menuItem = $menu->Append($id, $self->{option_labels}{$opt_key});
+                wxTheApp->set_menu_item_icon($menuItem, $icon) if $icon;
+                
                 EVT_MENU($menu, $id, sub {
                     $self->{config}->set($opt_key, $self->{default_config}->get($opt_key));
                     $self->update_optgroup;
-                    $self->{on_change}->() if $self->{on_change};
+                    $self->{on_change}->($opt_key) if $self->{on_change};
                 });
             }
             $self->PopupMenu($menu, $btn->GetPosition);
@@ -64,39 +92,59 @@ sub new {
     return $self;
 }
 
+# Sets the config used to get the default values for user-added options.
 sub set_default_config {
     my ($self, $config) = @_;
     $self->{default_config} = $config;
 }
 
+# Sets the target config, whose options will be displayed in the OptionsGroup.
 sub set_config {
     my ($self, $config) = @_;
     $self->{config} = $config;
     $self->update_optgroup;
 }
 
+# Sets the options listed in the Add button.
 sub set_opt_keys {
     my ($self, $opt_keys) = @_;
     
     # sort options by category+label
-    $self->{option_labels} = {
-        map { $_ => sprintf('%s > %s', $Slic3r::Config::Options->{$_}{category}, $Slic3r::Config::Options->{$_}{full_label} // $Slic3r::Config::Options->{$_}{label}) } @$opt_keys
+    $self->{option_labels} = {};
+    foreach my $opt_key (@$opt_keys) {
+        my $def = $Slic3r::Config::Options->{$opt_key} or next;
+        if (!$def->{category}) {
+            #printf "Skipping %s\n", $opt_key;
+            next;
+        }
+        $self->{option_labels}{$opt_key} = sprintf '%s > %s',
+            $def->{category},
+            $def->{full_label} // $def->{label};
     };
-    $self->{options} = [ sort { $self->{option_labels}{$a} cmp $self->{option_labels}{$b} } @$opt_keys ];
+    $self->{options} = [ sort { $self->{option_labels}{$a} cmp $self->{option_labels}{$b} } keys %{$self->{option_labels}} ];
 }
 
+# Sets the options that user can't remove.
 sub set_fixed_options {
     my ($self, $opt_keys) = @_;
     $self->{fixed_options} = { map {$_ => 1} @$opt_keys };
     $self->update_optgroup;
 }
 
+sub fixed_options {
+    my ($self) = @_;
+    
+    return keys %{$self->{fixed_options}};
+}
+
 sub update_optgroup {
     my $self = shift;
     
     $self->{options_sizer}->Clear(1);
     return if !defined $self->{config};
     
+    $self->{btn_add}->Show($self->{editable});
+    
     my %categories = ();
     foreach my $opt_key (@{$self->{config}->get_keys}) {
         my $category = $Slic3r::Config::Options->{$opt_key}{category};
@@ -104,7 +152,8 @@ sub update_optgroup {
         push @{$categories{$category}}, $opt_key;
     }
     foreach my $category (sort keys %categories) {
-        my $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
+        my $optgroup;
+        $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
             parent          => $self,
             title           => $category,
             config          => $self->{config},
@@ -112,27 +161,33 @@ sub update_optgroup {
             label_font      => $Slic3r::GUI::small_font,
             sidetext_font   => $Slic3r::GUI::small_font,
             label_width     => 120,
-            on_change       => sub { $self->{on_change}->() if $self->{on_change} },
+            on_change       => sub {
+                my ($opt_key) = @_;
+                $self->{on_change}->($opt_key) if $self->{on_change};
+            },
             extra_column    => sub {
                 my ($line) = @_;
                 
-                my $opt_key = $line->get_options->[0]->opt_id;  # we assume that we have one option per line
+                my $opt_id = $line->get_options->[0]->opt_id;  # we assume that we have one option per line
+                my ($opt_key, $opt_index) = @{ $optgroup->_opt_map->{$opt_id} };
                 
                 # disallow deleting fixed options
-                return undef if $self->{fixed_options}{$opt_key};
+                return undef if $self->{fixed_options}{$opt_key} || !$self->{editable};
                 
                 my $btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("delete.png"), wxBITMAP_TYPE_PNG),
                     wxDefaultPosition, wxDefaultSize, Wx::wxBORDER_NONE);
                 EVT_BUTTON($self, $btn, sub {
                     $self->{config}->erase($opt_key);
-                    $self->{on_change}->() if $self->{on_change};
+                    $self->{on_change}->($opt_key) if $self->{on_change};
                     wxTheApp->CallAfter(sub { $self->update_optgroup });
                 });
                 return $btn;
             },
         );
         foreach my $opt_key (sort @{$categories{$category}}) {
-            $optgroup->append_single_option_line($opt_key);
+            # For array options we override the first value.
+            my $opt_index = (ref($self->{config}->get($opt_key)) eq 'ARRAY') ? 0 : -1;
+            $optgroup->append_single_option_line($opt_key, $opt_index);
         }
         $self->{options_sizer}->Add($optgroup->sizer, 0, wxEXPAND | wxBOTTOM, 0);
     }
@@ -154,4 +209,11 @@ sub disable {
     $self->Disable;
 }
 
+# Shows or hides the Add button.
+sub set_editable {
+    my ($self, $editable) = @_;
+    
+    $self->{editable} = $editable;
+}
+
 1;
diff --git a/lib/Slic3r/GUI/Preferences.pm b/lib/Slic3r/GUI/Preferences.pm
index 231eb5cc91..9c96efa3a4 100644
--- a/lib/Slic3r/GUI/Preferences.pm
+++ b/lib/Slic3r/GUI/Preferences.pm
@@ -20,16 +20,6 @@ sub new {
         },
         label_width => 200,
     );
-    $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
-        opt_id      => 'mode',
-        type        => 'select',
-        label       => 'Mode',
-        tooltip     => 'Choose between a simpler, basic mode and an expert mode with more options and more complicated interface.',
-        labels      => ['Simple','Expert'],
-        values      => ['simple','expert'],
-        default     => $Slic3r::GUI::Settings->{_}{mode},
-        width       => 100,
-    ));
     $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
         opt_id      => 'version_check',
         type        => 'bool',
diff --git a/lib/Slic3r/GUI/Preset.pm b/lib/Slic3r/GUI/Preset.pm
new file mode 100644
index 0000000000..5bdd0f20e5
--- /dev/null
+++ b/lib/Slic3r/GUI/Preset.pm
@@ -0,0 +1,210 @@
+package Slic3r::GUI::Preset;
+use Moo;
+
+use Unicode::Normalize;
+use Wx qw(:dialog :icon :id wxTheApp);
+
+has 'group'     => (is => 'ro', required => 1);
+has 'default'   => (is => 'ro', default => sub { 0 });
+has 'external'  => (is => 'ro', default => sub { 0 });
+has 'name'      => (is => 'rw', required => 1);
+has 'file'      => (is => 'rw');
+has '_config'   => (is => 'rw', default => sub { Slic3r::Config->new });
+has '_dirty_config' => (is => 'ro', default => sub { Slic3r::Config->new });
+
+sub BUILD {
+    my ($self) = @_;
+    
+    $self->name(Unicode::Normalize::NFC($self->name));
+}
+
+sub _loaded {
+    my ($self) = @_;
+    
+    return !$self->_config->empty;
+}
+
+sub dirty_options {
+    my ($self) = @_;
+    
+    my @dirty = ();
+    
+    # Options present in both configs with different values:
+    push @dirty, @{$self->_config->diff($self->_dirty_config)};
+    
+    # Overrides added to the dirty config:
+    my @extra = $self->_group_class->overriding_options;
+    push @dirty, grep { !$self->_config->has($_) && $self->_dirty_config->has($_) } @extra;
+    # Overrides removed from the dirty config:
+    push @dirty, grep { $self->_config->has($_) && !$self->_dirty_config->has($_) } @extra;
+    
+    return @dirty;
+}
+
+sub dirty {
+    my ($self) = @_;
+    
+    return !!$self->dirty_options;
+}
+
+sub dropdown_name {
+    my ($self) = @_;
+    
+    my $name = $self->name;
+    $name .= " (modified)" if $self->dirty;
+    return $name;
+}
+
+sub file_exists {
+    my ($self) = @_;
+    
+    die "Can't call file_exists() on a non-file preset" if !$self->file;
+    return -e Slic3r::encode_path($self->file);
+}
+
+sub rename {
+    my ($self, $name) = @_;
+    
+    $self->name($name);
+    $self->file(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $self->group, $name);
+}
+
+sub prompt_unsaved_changes {
+    my ($self, $parent) = @_;
+    
+    if ($self->dirty) {
+        my $name = $self->default ? 'Default preset' : "Preset \"" . $self->name . "\"";
+        
+        my $opts = '';
+        foreach my $opt_key ($self->dirty_options) {
+            my $opt = $Slic3r::Config::Options->{$opt_key};
+            my $name = $opt->{full_label} // $opt->{label};
+            if ($opt->{category}) {
+                $name = $opt->{category} . " > $name";
+            }
+            $opts .= "- $name\n";
+        }
+        
+        my $msg = sprintf "%s has unsaved changes:\n%s\nDo you want to save them?", $name, $opts;
+        my $confirm = Wx::MessageDialog->new($parent, $msg,
+            'Unsaved Changes', wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION);
+        $confirm->SetYesNoCancelLabels('Save', 'Discard', 'Cancel');
+        my $res = $confirm->ShowModal;
+        
+        if ($res == wxID_CANCEL) {
+            return 0;
+        } elsif ($res == wxID_YES) {
+            return $self->save($self->default ? undef : $self->name);
+        } elsif ($res == wxID_NO) {
+            $self->dismiss_changes;
+            return 1;
+        }
+    }
+    
+    return 1;
+}
+
+sub save {
+    my ($self, $name, $parent) = @_;
+    
+    if (!$name) {
+        my $default_name = $self->default ? 'Untitled' : $self->name;
+        $default_name =~ s/\.ini$//i;
+    
+        my $dlg = Slic3r::GUI::SavePresetWindow->new($parent,
+            default => $default_name,
+            values  => [ map $_->name, grep !$_->default && !$_->external, @{wxTheApp->presets->{$self->name}} ],
+        );
+        return 0 unless $dlg->ShowModal == wxID_OK;
+        $name = $dlg->get_name;
+    }
+    
+    $self->rename($name);
+    
+    if (!$self->file) {
+        die "Calling save() without setting filename";
+    }
+    
+    $self->_config->clear;
+    $self->_config->apply($self->_dirty_config);
+    $self->_config->save($self->file);
+    wxTheApp->load_presets;
+    
+    return 1;
+}
+
+sub dismiss_changes {
+    my ($self) = @_;
+    
+    $self->_dirty_config->clear;
+    $self->_dirty_config->apply($self->_config);
+}
+
+sub delete {
+    my ($self) = @_;
+    
+    die "Default config can't be deleted" if $self->default;
+    die "External configs can't be deleted" if $self->external;
+    
+    # Otherwise wxTheApp->load_presets() will keep it
+    $self->dismiss_changes;
+    
+    if ($self->file) {
+        unlink Slic3r::encode_path($self->file) if $self->file_exists;
+        $self->file(undef);
+    }
+}
+
+# This returns the loaded config with the dirty options applied.
+sub dirty_config {
+    my ($self) = @_;
+    
+    $self->load_config if !$self->_loaded;
+    
+    return $self->_dirty_config->clone;
+}
+
+sub load_config {
+    my ($self) = @_;
+    
+    my @keys = $self->_group_class->options;
+    my @extra_keys = $self->_group_class->overriding_options;
+    
+    if ($self->default) {
+        $self->_config(Slic3r::Config->new_from_defaults(@keys));
+    } elsif ($self->file) {
+        if (!$self->file_exists) {
+            Slic3r::GUI::show_error(undef, "The selected preset does not exist anymore (" . $self->file . ").");
+            return undef;
+        }
+        my $external_config = Slic3r::Config->load($self->file);
+        if (!@keys) {
+            $self->_config($external_config);
+        } else {
+            # apply preset values on top of defaults
+            my $config = Slic3r::Config->new_from_defaults(@keys);
+            $config->set($_, $external_config->get($_))
+                for grep $external_config->has($_), @keys;
+            
+            # For extra_keys we don't populate defaults.
+            if (@extra_keys && !$self->external) {
+                $config->set($_, $external_config->get($_))
+                    for grep $external_config->has($_), @extra_keys;
+            }
+        
+            $self->_config($config);
+        }
+    }
+    
+    $self->_dirty_config->apply($self->_config);
+    
+    return $self->_config;
+}
+
+sub _group_class {
+    my ($self) = @_;
+    
+    return "Slic3r::GUI::PresetEditor::".ucfirst $self->group;
+}
+
+1;
diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/PresetEditor.pm
similarity index 80%
rename from lib/Slic3r/GUI/Tab.pm
rename to lib/Slic3r/GUI/PresetEditor.pm
index 770060edf4..66cc4df230 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/PresetEditor.pm
@@ -1,7 +1,4 @@
-# The "Expert" tab at the right of the main tabbed window.
-# The "Expert" is enabled by File->Preferences dialog.
-
-package Slic3r::GUI::Tab;
+package Slic3r::GUI::PresetEditor;
 use strict;
 use warnings;
 use utf8;
@@ -10,19 +7,21 @@ use File::Basename qw(basename);
 use List::Util qw(first);
 use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :treectrl :window
     :button wxTheApp);
-use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED);
+use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED EVT_CHECKBOX);
 use base qw(Wx::Panel Class::Accessor);
 
-__PACKAGE__->mk_accessors(qw(current_preset));
+__PACKAGE__->mk_accessors(qw(current_preset config));
 
 sub new {
     my $class = shift;
     my ($parent, %params) = @_;
     my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
     
+    $self->{presets} = wxTheApp->presets->{$self->name};
+    
     # horizontal sizer
     $self->{sizer} = Wx::BoxSizer->new(wxHORIZONTAL);
-    $self->{sizer}->SetSizeHints($self);
+    #$self->{sizer}->SetSizeHints($self);
     $self->SetSizer($self->{sizer});
     
     # left vertical sizer
@@ -89,76 +88,46 @@ sub new {
     
     EVT_CHOICE($parent, $self->{presets_choice}, sub {
         $self->on_select_preset;
-        $self->_on_presets_changed;
     });
     
     EVT_BUTTON($self, $self->{btn_save_preset}, sub { $self->save_preset });
     
     EVT_BUTTON($self, $self->{btn_delete_preset}, sub {
-        my $i = $self->current_preset;
-        return if $i == 0;  # this shouldn't happen but let's trap it anyway
         my $res = Wx::MessageDialog->new($self, "Are you sure you want to delete the selected preset?", 'Delete Preset', wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION)->ShowModal;
         return unless $res == wxID_YES;
-        if (-e $self->{presets}[$i]->file) {
-            unlink $self->{presets}[$i]->file;
-        }
-        splice @{$self->{presets}}, $i, 1;
-        $self->{presets_choice}->Delete($i);
+        
+        $self->current_preset->delete;
         $self->current_preset(undef);
-        $self->select_preset(0);
-        $self->_on_presets_changed;
+        wxTheApp->load_presets;
+        $self->load_presets;
+        $self->select_preset(0, 1);
     });
     
-    # C++ instance DynamicPrintConfig
-    $self->{config} = Slic3r::Config->new;
-    # Initialize the DynamicPrintConfig by default keys/values.
-    # Possible %params keys: no_controller
-    $self->build(%params);
+    $self->config(Slic3r::Config->new_from_defaults($self->options));
+    
+    $self->build;
     $self->update_tree;
+    $self->load_presets;
     $self->_update;
-    if ($self->hidden_options) {
-        $self->{config}->apply(Slic3r::Config->new_from_defaults($self->hidden_options));
-    }
     
     return $self;
 }
 
-sub get_current_preset {
-    my $self = shift;
-    return $self->get_preset($self->current_preset);
-}
-
-sub get_preset {
-    my ($self, $i) = @_;
-    return $self->{presets}[$i];
-}
-
+# This is called by the save button.
 sub save_preset {
-    my ($self, $name) = @_;
+    my ($self) = @_;
     
     # since buttons (and choices too) don't get focus on Mac, we set focus manually
     # to the treectrl so that the EVT_* events are fired for the input field having
     # focus currently. is there anything better than this?
     $self->{treectrl}->SetFocus;
     
-    if (!defined $name) {
-        my $preset = $self->get_current_preset;
-        my $default_name = $preset->default ? 'Untitled' : $preset->name;
-        $default_name =~ s/\.ini$//i;
-    
-        my $dlg = Slic3r::GUI::SavePresetWindow->new($self,
-            title   => lc($self->title),
-            default => $default_name,
-            values  => [ map $_->name, grep !$_->default && !$_->external, @{$self->{presets}} ],
-        );
-        return unless $dlg->ShowModal == wxID_OK;
-        $name = $dlg->get_name;
-    }
-    
-    $self->config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $self->name, $name);
+    my $preset = $self->current_preset;
+    $preset->save(undef, $self);
     $self->load_presets;
-    $self->select_preset_by_name($name);
-    $self->_on_presets_changed;
+    $self->select_preset_by_name($preset->name);
+    
+    return 1;
 }
 
 sub on_value_change {
@@ -166,94 +135,80 @@ sub on_value_change {
     $self->{on_value_change} = $cb;
 }
 
-sub on_presets_changed {
-    my ($self, $cb) = @_;
-    $self->{on_presets_changed} = $cb;
-}
-
 # This method is supposed to be called whenever new values are loaded
 # or changed by user (so also when a preset is loaded).
 # propagate event to the parent
 sub _on_value_change {
-    my $self = shift;
+    my ($self, $opt_key) = @_;
     
-    $self->{on_value_change}->(@_) if $self->{on_value_change};
+    $self->current_preset->_dirty_config->apply($self->config);
+    $self->{on_value_change}->($opt_key) if $self->{on_value_change};
+    $self->load_presets;
     $self->_update;
 }
 
 sub _update {}
 
-sub _on_presets_changed {
-    my $self = shift;
-    
-    $self->{on_presets_changed}->(
-        $self->{presets},
-        scalar($self->{presets_choice}->GetSelection),
-        $self->is_dirty,
-    ) if $self->{on_presets_changed};
-}
-
 sub on_preset_loaded {}
-sub hidden_options {}
-sub config { $_[0]->{config}->clone }
-
-sub select_default_preset {
-    my $self = shift;
-    $self->select_preset(0);
-}
 
 sub select_preset {
-    my $self = shift;
-    $self->{presets_choice}->SetSelection($_[0]);
-    $self->on_select_preset;
+    my ($self, $i, $force) = @_;
+    
+    $self->{presets_choice}->SetSelection($i);
+    $self->on_select_preset($force);
 }
 
 sub select_preset_by_name {
-    my ($self, $name) = @_;
+    my ($self, $name, $force) = @_;
     
-    $name = Unicode::Normalize::NFC($name);
-    $self->select_preset(first { $self->{presets}[$_]->name eq $name } 0 .. $#{$self->{presets}});
+    my $presets = wxTheApp->presets->{$self->name};
+    my $i = first { $presets->[$_]->name eq $name } 0..$#$presets;
+    $self->{presets_choice}->SetSelection($i);
+    $self->on_select_preset($force);
+}
+
+sub prompt_unsaved_changes {
+    my ($self) = @_;
+    
+    return 1 if !$self->current_preset;
+    return $self->current_preset->prompt_unsaved_changes($self);
 }
 
 sub on_select_preset {
-    my $self = shift;
+    my ($self, $force) = @_;
     
-    if ($self->is_dirty) {
-        my $old_preset = $self->get_current_preset;
-        my $name = $old_preset->default ? 'Default preset' : "Preset \"" . $old_preset->name . "\"";
-        
-        my @option_names = ();
-        foreach my $opt_key (@{$self->dirty_options}) {
-            my $opt = $Slic3r::Config::Options->{$opt_key};
-            my $name = $opt->{full_label} // $opt->{label};
-            if ($opt->{category}) {
-                $name = $opt->{category} . " > $name";
-            }
-            push @option_names, $name;
-        }
-        
-        my $changes = join "\n", map "- $_", @option_names;
-        my $confirm = Wx::MessageDialog->new($self, "$name has unsaved changes:\n$changes\n\nDiscard changes and continue anyway?",
-                                             'Unsaved Changes', wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
-        if ($confirm->ShowModal == wxID_NO) {
-            $self->{presets_choice}->SetSelection($self->current_preset);
-            
-            # trigger the on_presets_changed event so that we also restore the previous value
-            # in the plater selector
-            $self->_on_presets_changed;
-            return;
-        }
+    # This method is called:
+    # - upon first initialization;
+    # - whenever user selects a preset from the dropdown;
+    # - whenever select_preset() or select_preset_by_name() are called.
+    
+    # Get the selected name.
+    my $preset = wxTheApp->presets->{$self->name}->[$self->{presets_choice}->GetSelection];
+    
+    # If selection didn't change, do nothing.
+    return if defined $self->current_preset && $preset->name eq $self->current_preset->name;
+    
+    # If we have unsaved changes, prompt user.
+    if (!$force && !$self->prompt_unsaved_changes) {
+        # User decided not to save the current changes, so we restore the previous selection.
+        my $presets = wxTheApp->presets->{$self->name};
+        my $i = first { $presets->[$_]->name eq $self->current_preset->name } 0..$#$presets;
+        $self->{presets_choice}->SetSelection($i);
+        return;
     }
     
-    $self->current_preset($self->{presets_choice}->GetSelection);
-    my $preset = $self->get_current_preset;
-    my $preset_config = $self->get_preset_config($preset);
+    $self->current_preset($preset);
+    
+    # We reload presets in order to remove the "(modified)" suffix in case user was 
+    # prompted and chose to discard changes.
+    $self->load_presets;
+    
+    $preset->load_config if !$preset->_loaded;
+    $self->config->clear;
+    $self->config->apply($preset->dirty_config);
+    
     eval {
         local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
-        foreach my $opt_key (@{$self->{config}->get_keys}) {
-            $self->{config}->set($opt_key, $preset_config->get($opt_key))
-                if $preset_config->has($opt_key);
-        }
         ($preset->default || $preset->external)
             ? $self->{btn_delete_preset}->Disable
             : $self->{btn_delete_preset}->Enable;
@@ -261,29 +216,11 @@ sub on_select_preset {
         $self->_update;
         $self->on_preset_loaded;
         $self->reload_config;
-        $Slic3r::GUI::Settings->{presets}{$self->name} = $preset->file ? basename($preset->file) : '';
     };
     if ($@) {
         $@ = "I was unable to load the selected config file: $@";
         Slic3r::GUI::catch_error($self);
-        $self->select_default_preset;
     }
-        
-    # use CallAfter because some field triggers schedule on_change calls using CallAfter,
-    # and we don't want them to be called after this update_dirty() as they would mark the 
-    # preset dirty again
-    # (not sure this is true anymore now that update_dirty is idempotent)
-    wxTheApp->CallAfter(sub {
-        $self->_on_presets_changed;
-        $self->update_dirty;
-    });
-    
-    wxTheApp->save_settings;
-}
-
-sub init_config_options {
-    my ($self, @opt_keys) = @_;
-    $self->{config}->apply(Slic3r::Config->new_from_defaults(@opt_keys));
 }
 
 sub add_options_page {
@@ -296,7 +233,7 @@ sub add_options_page {
         $self->{iconcount}++;
     }
     
-    my $page = Slic3r::GUI::Tab::Page->new($self, $title, $self->{iconcount});
+    my $page = Slic3r::GUI::PresetEditor::Page->new($self, $title, $self->{iconcount});
     $page->Hide;
     $self->{sizer}->Add($page, 1, wxEXPAND | wxLEFT, 5);
     push @{$self->{pages}}, $page;
@@ -305,6 +242,7 @@ sub add_options_page {
 
 sub reload_config {
     my $self = shift;
+    
     $_->reload_config for @{$self->{pages}};
 }
 
@@ -333,100 +271,35 @@ sub update_tree {
     }
 }
 
-sub update_dirty {
-    my $self = shift;
-    
-    foreach my $i (0..$#{$self->{presets}}) {
-        my $preset = $self->get_preset($i);
-        if ($i == $self->current_preset && $self->is_dirty) {
-            $self->{presets_choice}->SetString($i, $preset->name . " (modified)");
-        } else {
-            $self->{presets_choice}->SetString($i, $preset->name);
-        }
-    }
-    $self->{presets_choice}->SetSelection($self->current_preset);  # http://trac.wxwidgets.org/ticket/13769
-    $self->_on_presets_changed;
-}
-
-sub is_dirty {
-    my $self = shift;
-    return @{$self->dirty_options} > 0;
-}
-
-sub dirty_options {
-    my $self = shift;
-    
-    return [] if !defined $self->current_preset;  # happens during initialization
-    return $self->get_preset_config($self->get_current_preset)->diff($self->{config});
-}
-
 sub load_presets {
     my $self = shift;
     
-    $self->{presets} = [
-        Slic3r::GUI::Tab::Preset->new(
-            default => 1,
-            name    => '- default -',
-        ),
-    ];
-    
-    my %presets = wxTheApp->presets($self->name);
-    foreach my $preset_name (sort keys %presets) {
-        push @{$self->{presets}}, Slic3r::GUI::Tab::Preset->new(
-            name => $preset_name,
-            file => $presets{$preset_name},
-        );
-    }
-    
-    $self->current_preset(undef);
+    my $presets = wxTheApp->presets->{$self->name};
     $self->{presets_choice}->Clear;
-    $self->{presets_choice}->Append($_->name) for @{$self->{presets}};
-    {
-        # load last used preset
-        my $i = first { basename($self->{presets}[$_]->file) eq ($Slic3r::GUI::Settings->{presets}{$self->name} || '') } 1 .. $#{$self->{presets}};
-        $self->select_preset($i || 0);
+    foreach my $preset (@$presets) {
+        $self->{presets_choice}->Append($preset->dropdown_name);
+        
+        # Preserve selection.
+        if ($self->current_preset && $self->current_preset->name eq $preset->name) {
+            $self->{presets_choice}->SetSelection($self->{presets_choice}->GetCount-1);
+        }
     }
-    $self->_on_presets_changed;
 }
 
-sub load_config_file {
-    my $self = shift;
-    my ($file) = @_;
-    
-    # look for the loaded config among the existing menu items
-    my $i = first { $self->{presets}[$_]{file} eq $file && $self->{presets}[$_]{external} } 1..$#{$self->{presets}};
-    if (!$i) {
-        my $preset_name = basename($file);  # keep the .ini suffix
-        push @{$self->{presets}}, Slic3r::GUI::Tab::Preset->new(
-            file        => $file,
-            name        => $preset_name,
-            external    => 1,
-        );
-        $self->{presets_choice}->Append($preset_name);
-        $i = $#{$self->{presets}};
-    }
-    $self->{presets_choice}->SetSelection($i);
-    $self->on_select_preset;
-    $self->_on_presets_changed;
-}
-
-sub load_config {
+# This is called internally whenever we make automatic adjustments to configuration
+# based on user actions.
+sub _load_config {
     my $self = shift;
     my ($config) = @_;
     
-    foreach my $opt_key (@{$self->{config}->diff($config)}) {
-        $self->{config}->set($opt_key, $config->get($opt_key));
-        $self->update_dirty;
-    }
+    my $diff = $self->config->diff($config);
+    $self->config->set($_, $config->get($_)) for @$diff;
+    # First apply all changes, then call all the _on_value_change triggers.
+    $self->_on_value_change($_) for @$diff;
     $self->reload_config;
     $self->_update;
 }
 
-sub get_preset_config {
-    my ($self, $preset) = @_;
-    return $preset->config($self->{config}->get_keys);
-}
-
 sub get_field {
     my ($self, $opt_key, $opt_index) = @_;
     
@@ -448,19 +321,90 @@ sub set_value {
     return $changed;
 }
 
-package Slic3r::GUI::Tab::Print;
-use base 'Slic3r::GUI::Tab';
+sub _compatible_printers_widget {
+    my ($self) = @_;
+    
+    return sub {
+        my ($parent) = @_;
+        
+        my $checkbox = $self->{compatible_printers_checkbox} = Wx::CheckBox->new($parent, -1, "All");
+        
+        my $btn = $self->{compatible_printers_btn} = Wx::Button->new($parent, -1, "Set…", wxDefaultPosition, wxDefaultSize,
+            wxBU_LEFT | wxBU_EXACTFIT);
+        $btn->SetFont($Slic3r::GUI::small_font);
+        if ($Slic3r::GUI::have_button_icons) {
+            $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG));
+        }
+        
+        my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
+        $sizer->Add($checkbox, 0, wxALIGN_CENTER_VERTICAL);
+        $sizer->Add($btn, 0, wxALIGN_CENTER_VERTICAL);
+        
+        EVT_CHECKBOX($self, $checkbox, sub {
+            if ($checkbox->GetValue) {
+                $btn->Disable;
+            } else {
+                $btn->Enable;
+            }
+        });
+        
+        EVT_BUTTON($self, $btn, sub {
+            my @presets = map $_->name, grep !$_->default && !$_->external,
+                @{wxTheApp->presets->{printer}};
+            
+            my $dlg = Wx::MultiChoiceDialog->new($self,
+                "Select the printers this profile is compatible with.",
+                "Compatible printers", \@presets);
+            
+            my @selections = ();
+            foreach my $preset_name (@{ $self->config->get('compatible_printers') }) {
+                push @selections, first { $presets[$_] eq $preset_name } 0..$#presets;
+            }
+            $dlg->SetSelections(@selections);
+            
+            if ($dlg->ShowModal == wxID_OK) {
+                my $value = [ @presets[$dlg->GetSelections] ];
+                if (!@$value) {
+                    $checkbox->SetValue(1);
+                    $btn->Disable;
+                }
+                $self->config->set('compatible_printers', $value);
+                $self->_on_value_change('compatible_printers');
+            }
+        });
+        
+        return $sizer;
+    };
+}
+
+sub _reload_compatible_printers_widget {
+    my ($self) = @_;
+    
+    if (@{ $self->config->get('compatible_printers') }) {
+        $self->{compatible_printers_checkbox}->SetValue(0);
+        $self->{compatible_printers_btn}->Enable;
+    } else {
+        $self->{compatible_printers_checkbox}->SetValue(1);
+        $self->{compatible_printers_btn}->Disable;
+    }
+}
+
+sub options { die "Unimplemented options()"; }
+sub overridable_options { () }
+sub overriding_options  { () }
+
+package Slic3r::GUI::PresetEditor::Print;
+use base 'Slic3r::GUI::PresetEditor';
 
 use List::Util qw(first any);
-use Wx qw(:icon :dialog :id);
+use Wx qw(:icon :dialog :id :misc :button :sizer);
+use Wx::Event qw(EVT_BUTTON EVT_CHECKLISTBOX);
 
 sub name { 'print' }
 sub title { 'Print Settings' }
 
-sub build {
-    my $self = shift;
-    
-    $self->init_config_options(qw(
+sub options {
+    return qw(
         layer_height first_layer_height
         perimeters spiral_vase
         top_solid_layers bottom_solid_layers
@@ -497,9 +441,39 @@ sub build {
         external_perimeter_extrusion_width infill_extrusion_width solid_infill_extrusion_width 
         top_infill_extrusion_width support_material_extrusion_width
         infill_overlap bridge_flow_ratio
-        xy_size_compensation resolution
-    ));
-    $self->{config}->set('print_settings_id', '');
+        xy_size_compensation resolution overridable compatible_printers
+        print_settings_id
+    )
+}
+
+sub build {
+    my $self = shift;
+    
+    my $overridable_widget = sub {
+        my ($parent) = @_;
+        
+        my $Options = $Slic3r::Config::Options;
+        my %options = (
+            map { $_ => sprintf('%s > %s', $Options->{$_}{category}, $Options->{$_}{full_label} // $Options->{$_}{label}) }
+                grep { exists $Options->{$_} && $Options->{$_}{category} } $self->options
+        );
+        my @opt_keys = sort { $options{$a} cmp $options{$b} } keys %options;
+        $self->{overridable_opt_keys} = [ @opt_keys ];
+        
+        my $listbox = $self->{overridable_list} = Wx::CheckListBox->new($parent, -1,
+            wxDefaultPosition, [-1, 320], [ map $options{$_}, @opt_keys ]);
+        
+        EVT_CHECKLISTBOX($self, $listbox, sub {
+            my $value = [ map $opt_keys[$_], grep $listbox->IsChecked($_), 0..$#opt_keys ];
+            $self->config->set('overridable', $value);
+            $self->_on_value_change('overridable');
+        });
+        
+        my $sizer = Wx::BoxSizer->new(wxVERTICAL);
+        $sizer->Add($listbox, 0, wxEXPAND);
+        
+        return $sizer;
+    };
     
     {
         my $page = $self->add_options_page('Layers and perimeters', 'layers.png');
@@ -643,7 +617,7 @@ sub build {
     }
     
     {
-        my $page = $self->add_options_page('Multiple Extruders', 'funnel.png');
+        my $page = $self->add_options_page('Multiple extruders', 'funnel.png');
         {
             my $optgroup = $page->new_optgroup('Extruders');
             $optgroup->append_single_option_line('perimeter_extruder');
@@ -664,7 +638,7 @@ sub build {
     }
     
     {
-        my $page = $self->add_options_page('Advanced', 'wrench.png');
+        my $page = $self->add_options_page('Advanced', 'wand.png');
         {
             my $optgroup = $page->new_optgroup('Extrusion width',
                 label_width => 180,
@@ -738,6 +712,45 @@ sub build {
             $optgroup->append_single_option_line($option);
         }
     }
+    
+    {
+        my $page = $self->add_options_page('Overrides', 'wrench.png');
+        {
+            my $optgroup = $page->new_optgroup('Profile preferences');
+            {
+                my $line = Slic3r::GUI::OptionsGroup::Line->new(
+                    label       => 'Compatible printers',
+                    widget      => $self->_compatible_printers_widget,
+                );
+                $optgroup->append_line($line);
+            }
+        }
+        {
+            my $optgroup = $page->new_optgroup('Overridable settings (they will be displayed in the plater for quick changes)');
+            {
+                my $line = Slic3r::GUI::OptionsGroup::Line->new(
+                    widget      => $overridable_widget,
+                    full_width  => 1,
+                );
+                $optgroup->append_line($line);
+            }
+        }
+    }
+}
+
+sub reload_config {
+    my ($self) = @_;
+    
+    $self->_reload_compatible_printers_widget;
+    
+    {
+        my %overridable = map { $_ => 1 } @{ $self->config->get('overridable') };
+        for my $i (0..$#{$self->{overridable_opt_keys}}) {
+            $self->{overridable_list}->Check($i, $overridable{ $self->{overridable_opt_keys}[$i] });
+        }
+    }
+    
+    $self->SUPER::reload_config;
 }
 
 sub _update {
@@ -760,11 +773,11 @@ sub _update {
             $new_conf->set("top_solid_layers", 0);
             $new_conf->set("fill_density", 0);
             $new_conf->set("support_material", 0);
-            $self->load_config($new_conf);
+            $self->_load_config($new_conf);
         } else {
             my $new_conf = Slic3r::Config->new;
             $new_conf->set("spiral_vase", 0);
-            $self->load_config($new_conf);
+            $self->_load_config($new_conf);
         }
     }
 
@@ -790,7 +803,7 @@ sub _update {
                     $new_conf->set("support_material", 0);
                     $self->{support_material_overhangs_queried} = 0;
                 }
-                $self->load_config($new_conf);
+                $self->_load_config($new_conf);
             }
         }
     } else {
@@ -810,7 +823,7 @@ sub _update {
         } else {
             $new_conf->set("fill_density", 40);
         }
-        $self->load_config($new_conf);
+        $self->_load_config($new_conf);
     }
     
     my $have_perimeters = $config->perimeters > 0;
@@ -885,26 +898,34 @@ sub _update {
         for qw(standby_temperature_delta);
 }
 
-sub hidden_options { !$Slic3r::have_threads ? qw(threads) : () }
+package Slic3r::GUI::PresetEditor::Filament;
+use base 'Slic3r::GUI::PresetEditor';
 
-package Slic3r::GUI::Tab::Filament;
-use base 'Slic3r::GUI::Tab';
+use Wx qw(wxTheApp);
 
 sub name { 'filament' }
 sub title { 'Filament Settings' }
 
-sub build {
-    my $self = shift;
-    
-    $self->init_config_options(qw(
+sub options {
+    return qw(
         filament_colour filament_diameter filament_notes filament_max_volumetric_speed extrusion_multiplier filament_density filament_cost
         temperature first_layer_temperature bed_temperature first_layer_bed_temperature
-        fan_always_on cooling
+        fan_always_on cooling compatible_printers
         min_fan_speed max_fan_speed bridge_fan_speed disable_fan_first_layers
         fan_below_layer_time slowdown_below_layer_time min_print_speed
         start_filament_gcode end_filament_gcode
-    ));
-    $self->{config}->set('filament_settings_id', '');
+        filament_settings_id
+    );
+}
+
+sub overriding_options {
+    return (
+        Slic3r::GUI::PresetEditor::Printer->overridable_options,
+    );
+}
+
+sub build {
+    my $self = shift;
     
     {
         my $page = $self->add_options_page('Filament', 'spool.png');
@@ -983,27 +1004,6 @@ sub build {
             $optgroup->append_single_option_line('min_print_speed');
         }
     }
-
-    {
-        my $page = $self->add_options_page('Advanced', 'wrench.png');
-        {
-            my $optgroup = $page->new_optgroup('Print speed override');
-            $optgroup->append_single_option_line('filament_max_volumetric_speed', 0);
-        }
-    }
-
-    {
-        my $page = $self->add_options_page('Notes', 'note.png');
-        {
-            my $optgroup = $page->new_optgroup('Notes',
-                label_width => 0,
-            );
-            my $option = $optgroup->get_option('filament_notes', 0);
-            $option->full_width(1);
-            $option->height(250);
-            $optgroup->append_single_option_line($option);
-        }
-    }
     {
         my $page = $self->add_options_page('Custom G-code', 'script.png');
         {
@@ -1025,6 +1025,87 @@ sub build {
             $optgroup->append_single_option_line($option);
         }
     }
+
+    {
+        my $page = $self->add_options_page('Notes', 'note.png');
+        {
+            my $optgroup = $page->new_optgroup('Notes',
+                label_width => 0,
+            );
+            my $option = $optgroup->get_option('filament_notes', 0);
+            $option->full_width(1);
+            $option->height(250);
+            $optgroup->append_single_option_line($option);
+        }
+    }
+    
+    {
+        my $page = $self->add_options_page('Overrides', 'wrench.png');
+        {
+            my $optgroup = $page->new_optgroup('Profile preferences');
+            my $line = Slic3r::GUI::OptionsGroup::Line->new(
+                label       => 'Compatible printers',
+                widget      => $self->_compatible_printers_widget,
+            );
+            $optgroup->append_line($line);
+        }
+        {
+            my $optgroup = $page->new_optgroup('Overrides');
+            $optgroup->append_single_option_line('filament_max_volumetric_speed', 0);
+            
+            # Populate the overrides config.
+            my @overridable = $self->overriding_options;
+            $self->{overrides_config} = Slic3r::Config->new;
+            
+            # Populate the defaults with the current preset.
+            $self->{overrides_default_config} = Slic3r::Config->new;
+            $self->{overrides_default_config}->apply_only
+                (wxTheApp->{mainframe}->{plater}->config, \@overridable);
+            
+            my $line = Slic3r::GUI::OptionsGroup::Line->new(
+                label       => '',
+                full_width  => 1,
+                widget      => sub {
+                    my ($parent) = @_;
+                    
+                    $self->{overrides_panel} = my $panel = Slic3r::GUI::Plater::OverrideSettingsPanel->new($parent,
+                        size => [-1, 300],
+                        on_change => sub {
+                            my ($opt_key) = @_;
+                            $self->config->erase($_) for @overridable;
+                            $self->current_preset->_dirty_config->erase($_) for @overridable;
+                            $self->config->apply($self->{overrides_config});
+                            $self->_on_value_change($opt_key);
+                        });
+                    $panel->set_editable(1);
+                    $panel->set_default_config($self->{overrides_default_config});
+                    $panel->set_config($self->{overrides_config});
+                    $panel->set_opt_keys([@overridable]);
+                    
+                    return $panel;
+                },
+            );
+            $optgroup->append_line($line);
+        }
+    }
+}
+
+sub reload_config {
+    my ($self) = @_;
+    
+    $self->_reload_compatible_printers_widget;
+    
+    {
+        $self->{overrides_config}->clear;
+        foreach my $opt_key (@{$self->{overrides_default_config}->get_keys}) {
+            if ($self->config->has($opt_key)) {
+                $self->{overrides_config}->set($opt_key, $self->config->get($opt_key));
+            }
+        }
+        $self->{overrides_panel}->update_optgroup;
+    }
+    
+    $self->SUPER::reload_config;
 }
 
 sub _update {
@@ -1032,10 +1113,10 @@ sub _update {
     
     $self->_update_description;
     
-    my $cooling = $self->{config}->cooling;
+    my $cooling = $self->config->cooling;
     $self->get_field($_)->toggle($cooling)
         for qw(max_fan_speed fan_below_layer_time slowdown_below_layer_time min_print_speed);
-    $self->get_field($_)->toggle($cooling || $self->{config}->fan_always_on)
+    $self->get_field($_)->toggle($cooling || $self->config->fan_always_on)
         for qw(min_fan_speed disable_fan_first_layers);
 }
 
@@ -1068,19 +1149,16 @@ sub _update_description {
     $self->{description_line}->SetText($msg);
 }
 
-package Slic3r::GUI::Tab::Printer;
-use base 'Slic3r::GUI::Tab';
+package Slic3r::GUI::PresetEditor::Printer;
+use base 'Slic3r::GUI::PresetEditor';
 use Wx qw(wxTheApp :sizer :button :bitmap :misc :id :icon :dialog);
 use Wx::Event qw(EVT_BUTTON);
 
 sub name { 'printer' }
 sub title { 'Printer Settings' }
 
-sub build {
-    my $self = shift;
-    my (%params) = @_;
-    
-    $self->init_config_options(qw(
+sub options {
+    return qw(
         bed_shape z_offset z_steps_per_mm has_heatbed
         gcode_flavor use_relative_e_distances
         serial_port serial_speed
@@ -1090,9 +1168,22 @@ sub build {
         start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode
         nozzle_diameter extruder_offset
         retract_length retract_lift retract_speed retract_restart_extra retract_before_travel retract_layer_change wipe
-        retract_length_toolchange retract_restart_extra_toolchange
-    ));
-    $self->{config}->set('printer_settings_id', '');
+        retract_length_toolchange retract_restart_extra_toolchange retract_lift_above retract_lift_below
+        printer_settings_id
+    );
+}
+
+sub overridable_options {
+    return qw(
+        pressure_advance
+        retract_length retract_lift retract_speed retract_restart_extra
+        retract_before_travel retract_layer_change wipe
+    );
+}
+
+sub build {
+    my $self = shift;
+    my (%params) = @_;
     
     $self->{extruders_count} = 1;
     
@@ -1105,12 +1196,11 @@ sub build {
                 label => 'Bed shape',
             );
             $line->append_button("Set…", "cog.png", sub {
-                my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->{config}->bed_shape);
+                my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->config->bed_shape);
                 if ($dlg->ShowModal == wxID_OK) {
                     my $value = $dlg->GetValue;
-                    $self->{config}->set('bed_shape', $value);
-                    $self->update_dirty;
-                    $self->_on_value_change('bed_shape', $value);
+                    $self->config->set('bed_shape', $value);
+                    $self->_on_value_change('bed_shape');
                 }
             });
             $optgroup->append_line($line);
@@ -1137,7 +1227,6 @@ sub build {
                     wxTheApp->CallAfter(sub {
                         $self->_extruders_count_changed($optgroup->get_value('extruders_count'));
                     });
-                    $self->update_dirty;
                 }
             });
         }
@@ -1164,8 +1253,8 @@ sub build {
             $line->append_button("Test", "wrench.png", sub {
                 my $sender = Slic3r::GCode::Sender->new;
                 my $res = $sender->connect(
-                    $self->{config}->serial_port,
-                    $self->{config}->serial_speed,
+                    $self->config->serial_port,
+                    $self->config->serial_speed,
                 );
                 if ($res && $sender->wait_connected) {
                     Slic3r::GUI::show_info($self, "Connection to printer works correctly.", "Success!");
@@ -1191,10 +1280,8 @@ sub build {
                     my $dlg = Slic3r::GUI::BonjourBrowser->new($self, $entries);
                     if ($dlg->ShowModal == wxID_OK) {
                         my $value = $dlg->GetValue . ":" . $dlg->GetPort;
-                        $self->{config}->set('octoprint_host', $value);
-                        $self->update_dirty;
-                        $self->_on_value_change('octoprint_host', $value);
-                        $self->reload_config;
+                        $self->config->set('octoprint_host', $value);
+                        $self->_on_value_change('octoprint_host');
                     }
                 } else {
                     Wx::MessageDialog->new($self, 'No Bonjour device found', 'Device Browser', wxOK | wxICON_INFORMATION)->ShowModal;
@@ -1205,8 +1292,8 @@ sub build {
                 $ua->timeout(10);
 
                 my $res = $ua->get(
-                    "http://" . $self->{config}->octoprint_host . "/api/version",
-                    'X-Api-Key' => $self->{config}->octoprint_apikey,
+                    "http://" . $self->config->octoprint_host . "/api/version",
+                    'X-Api-Key' => $self->config->octoprint_apikey,
                 );
                 if ($res->is_success) {
                     Slic3r::GUI::show_info($self, "Connection to OctoPrint works correctly.", "Success!");
@@ -1298,7 +1385,7 @@ sub _extruders_count_changed {
     
     $self->{extruders_count} = $extruders_count;
     $self->_build_extruder_pages;
-    $self->_on_value_change('extruders_count', $extruders_count);
+    $self->_on_value_change('extruders_count');
     $self->_update;
 }
 
@@ -1313,7 +1400,7 @@ sub _build_extruder_pages {
     foreach my $extruder_idx (@{$self->{extruder_pages}} .. $self->{extruders_count}-1) {
         # extend options
         foreach my $opt_key ($self->_extruder_options) {
-            my $values = $self->{config}->get($opt_key);
+            my $values = $self->config->get($opt_key);
             if (!defined $values) {
                 $values = [ $default_config->get_at($opt_key, 0) ];
             } else {
@@ -1321,7 +1408,7 @@ sub _build_extruder_pages {
                 my $last_value = $values->[-1];
                 $values->[$extruder_idx] //= $last_value;
             }
-            $self->{config}->set($opt_key, $values)
+            $self->config->set($opt_key, $values)
                 or die "Unable to extend $opt_key";
         }
         
@@ -1367,9 +1454,9 @@ sub _build_extruder_pages {
     
     # remove extra config values
     foreach my $opt_key ($self->_extruder_options) {
-        my $values = $self->{config}->get($opt_key);
+        my $values = $self->config->get($opt_key);
         splice @$values, $self->{extruders_count} if $self->{extruders_count} <= $#$values;
-        $self->{config}->set($opt_key, $values)
+        $self->config->set($opt_key, $values)
             or die "Unable to truncate $opt_key";
     }
     
@@ -1446,7 +1533,7 @@ sub _update {
             } else {
                 $new_conf->set("use_firmware_retraction", 0);
             }
-            $self->load_config($new_conf);
+            $self->_load_config($new_conf);
         }
         
         $self->get_field('retract_length_toolchange', $i)->toggle($have_multiple_extruders);
@@ -1464,7 +1551,7 @@ sub on_preset_loaded {
     # update the extruders count field
     {
         # update the GUI field according to the number of nozzle diameters supplied
-        my $extruders_count = scalar @{ $self->{config}->nozzle_diameter };
+        my $extruders_count = scalar @{ $self->config->nozzle_diameter };
         $self->set_value('extruders_count', $extruders_count);
         $self->_extruders_count_changed($extruders_count);
     }
@@ -1478,10 +1565,10 @@ sub load_config_file {
         "Your configuration was imported. However, Slic3r is currently only able to import settings "
         . "for the first defined filament. We recommend you don't use exported configuration files "
         . "for multi-extruder setups and rely on the built-in preset management system instead.")
-        if @{ $self->{config}->nozzle_diameter } > 1;
+        if @{ $self->config->nozzle_diameter } > 1;
 }
 
-package Slic3r::GUI::Tab::Page;
+package Slic3r::GUI::PresetEditor::Page;
 use Wx qw(wxTheApp :misc :panel :sizer);
 use base 'Wx::ScrolledWindow';
 
@@ -1512,8 +1599,7 @@ sub new_optgroup {
         on_change       => sub {
             my ($opt_key, $value) = @_;
             wxTheApp->CallAfter(sub {
-                $self->GetParent->update_dirty;
-                $self->GetParent->_on_value_change($opt_key, $value);
+                $self->GetParent->_on_value_change($opt_key);
             });
         },
     );
@@ -1562,7 +1648,7 @@ sub new {
     
     my @values = @{$params{values}};
     
-    my $text = Wx::StaticText->new($self, -1, "Save " . lc($params{title}) . " as:", wxDefaultPosition, wxDefaultSize);
+    my $text = Wx::StaticText->new($self, -1, "Save profile as:", wxDefaultPosition, wxDefaultSize);
     $self->{combo} = Wx::ComboBox->new($self, -1, $params{default}, wxDefaultPosition, wxDefaultSize, \@values,
                                        wxTE_PROCESS_ENTER);
     my $buttons = $self->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
@@ -1600,33 +1686,4 @@ sub get_name {
     return $self->{chosen_name};
 }
 
-package Slic3r::GUI::Tab::Preset;
-use Moo;
-
-has 'default'   => (is => 'ro', default => sub { 0 });
-has 'external'  => (is => 'ro', default => sub { 0 });
-has 'name'      => (is => 'rw', required => 1);
-has 'file'      => (is => 'rw');
-
-sub config {
-    my ($self, $keys) = @_;
-    
-    if ($self->default) {
-        return Slic3r::Config->new_from_defaults(@$keys);
-    } else {
-        if (!-e Slic3r::encode_path($self->file)) {
-            Slic3r::GUI::show_error(undef, "The selected preset does not exist anymore (" . $self->file . ").");
-            return undef;
-        }
-        
-        # apply preset values on top of defaults
-        my $config = Slic3r::Config->new_from_defaults(@$keys);
-        my $external_config = Slic3r::Config->load($self->file);
-        $config->set($_, $external_config->get($_))
-            for grep $external_config->has($_), @$keys;
-        
-        return $config;
-    }
-}
-
 1;
diff --git a/lib/Slic3r/GUI/PresetEditorDialog.pm b/lib/Slic3r/GUI/PresetEditorDialog.pm
new file mode 100644
index 0000000000..6385844c5b
--- /dev/null
+++ b/lib/Slic3r/GUI/PresetEditorDialog.pm
@@ -0,0 +1,73 @@
+package Slic3r::GUI::PresetEditorDialog;
+use strict;
+use warnings;
+use Wx qw(:dialog :id :misc :sizer :button :icon wxTheApp WXK_ESCAPE);
+use Wx::Event qw(EVT_CLOSE EVT_CHAR_HOOK);
+use base qw(Wx::Dialog Class::Accessor);
+use utf8;
+
+__PACKAGE__->mk_accessors(qw(preset_editor));
+
+sub new {
+    my ($class, $parent) = @_;
+    my $self = $class->SUPER::new($parent, -1, "Settings", wxDefaultPosition, [900,500],
+        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDIALOG_EX_METAL);
+    
+    $self->preset_editor($self->preset_editor_class->new($self));
+    $self->SetTitle($self->preset_editor->title);
+    
+    my $sizer = Wx::BoxSizer->new(wxVERTICAL);
+    $sizer->Add($self->preset_editor, 1, wxEXPAND);
+    
+    $self->SetSizer($sizer);
+    #$sizer->SetSizeHints($self);
+    
+    if (0) {
+        my $buttons = $self->CreateStdDialogButtonSizer(wxCLOSE);
+        $sizer->Add($buttons, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
+    }
+    
+    wxTheApp->restore_window_pos($self, "preset_editor");
+    
+    EVT_CLOSE($self, sub {
+        my (undef, $event) = @_;
+        
+        # save window size
+        wxTheApp->save_window_pos($self, "preset_editor");
+        
+        # propagate event
+        $event->Skip;
+    });
+    
+    EVT_CHAR_HOOK($self, sub {
+        my (undef, $event) = @_;
+        
+        if ($event->GetKeyCode == WXK_ESCAPE) {
+            $self->Close;
+        } else {
+            $event->Skip;
+        }
+    });
+    
+    return $self;
+}
+
+
+package Slic3r::GUI::PresetEditorDialog::Printer;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Printer" }
+
+
+package Slic3r::GUI::PresetEditorDialog::Filament;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Filament" }
+
+
+package Slic3r::GUI::PresetEditorDialog::Print;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Print" }
+
+1;
diff --git a/lib/Slic3r/GUI/Projector.pm b/lib/Slic3r/GUI/Projector.pm
index 9023cb0c7d..c41b7e8ad4 100644
--- a/lib/Slic3r/GUI/Projector.pm
+++ b/lib/Slic3r/GUI/Projector.pm
@@ -44,7 +44,7 @@ sub new {
     $self->config(Slic3r::Config->new_from_defaults(
         qw(serial_port serial_speed bed_shape start_gcode end_gcode z_offset)
     ));
-    $self->config->apply(wxTheApp->{mainframe}->config);
+    $self->config->apply(wxTheApp->{mainframe}->{plater}->config);
     
     my @optgroups = ();
     {
@@ -520,9 +520,6 @@ sub _close {
     }
     wxTheApp->{mainframe}->Show;
     
-    my $printer_tab = wxTheApp->{mainframe}{options_tabs}{printer};
-    $printer_tab->load_config($self->config);
-    
     $self->EndModal(wxID_OK);
 }
 
@@ -555,7 +552,7 @@ sub BUILD {
     # init print
     {
         my $print = Slic3r::SLAPrint->new(wxTheApp->{mainframe}->{plater}->{model});
-        $print->apply_config(wxTheApp->{mainframe}->config);
+        $print->apply_config(wxTheApp->{mainframe}->{plater}->config);
         $self->_print($print);
         $self->screen->print($print);
     
diff --git a/lib/Slic3r/GUI/SLAPrintOptions.pm b/lib/Slic3r/GUI/SLAPrintOptions.pm
index 7b3348823f..042ddc2888 100644
--- a/lib/Slic3r/GUI/SLAPrintOptions.pm
+++ b/lib/Slic3r/GUI/SLAPrintOptions.pm
@@ -10,7 +10,7 @@ sub new {
     my $self = $class->SUPER::new($parent, -1, "SLA/DLP Print", wxDefaultPosition, wxDefaultSize);
     
     $self->config(Slic3r::Config::SLAPrint->new);
-    $self->config->apply_dynamic(wxTheApp->{mainframe}->config);
+    $self->config->apply_dynamic(wxTheApp->{mainframe}->{plater}->config);
     
     my $sizer = Wx::BoxSizer->new(wxVERTICAL);
     my $new_optgroup = sub {
@@ -103,8 +103,6 @@ sub _accept {
         return;
     }
     
-    wxTheApp->{mainframe}->load_config($self->config->dynamic);
-    
     $self->EndModal(wxID_OK);
     $self->Close;  # needed on Linux
     
@@ -113,6 +111,9 @@ sub _accept {
     # this double invocation is needed for properly hiding the MainFrame
     $projector->Show;
     $projector->ShowModal;
+    
+    # TODO: diff the new config with the selected presets and prompt the user for
+    # applying the changes to them.
 }
 
 1;
diff --git a/lib/Slic3r/GUI/SimpleTab.pm b/lib/Slic3r/GUI/SimpleTab.pm
deleted file mode 100644
index 6e7d00d09b..0000000000
--- a/lib/Slic3r/GUI/SimpleTab.pm
+++ /dev/null
@@ -1,351 +0,0 @@
-# The "Simple" Print Settings tab.
-# The "Simple" mode is enabled by File->Preferences dialog.
-
-package Slic3r::GUI::SimpleTab;
-use strict;
-use warnings;
-use utf8;
-
-use File::Basename qw(basename);
-use List::Util qw(first);
-use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :window :systemsettings);
-use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN);
-use base 'Wx::ScrolledWindow';
-
-sub new {
-    my $class = shift;
-    my ($parent, %params) = @_;
-    my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
-    
-    $self->SetScrollbars(1, 1, 1, 1);
-    
-    $self->{config} = Slic3r::Config->new;
-    $self->{optgroups} = [];
-    
-    $self->{vsizer} = Wx::BoxSizer->new(wxVERTICAL);
-    $self->SetSizer($self->{vsizer});
-    $self->build;
-    $self->_update;
-    
-    {
-        my $label = Wx::StaticText->new($self, -1, "Want more options? Switch to the Expert Mode.", wxDefaultPosition, wxDefaultSize);
-        $label->SetFont(Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-        $self->{vsizer}->Add($label, 0, wxEXPAND | wxALL, 10);
-    }
-    
-    return $self;
-}
-
-sub init_config_options {
-    my ($self, @opt_keys) = @_;
-    $self->{config}->apply(Slic3r::Config->new_from_defaults(@opt_keys));
-}
-
-sub new_optgroup {
-    my ($self, $title, %params) = @_;
-    
-    my $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
-        parent          => $self,
-        title           => $title,
-        config          => $self->{config},
-        label_width     => $params{label_width} // 200,
-        on_change       => sub { $self->_on_value_change(@_) },
-    );
-    
-    push @{$self->{optgroups}}, $optgroup;
-    $self->{vsizer}->Add($optgroup->sizer, 0, wxEXPAND | wxALL, 10);
-    
-    return $optgroup;
-}
-
-sub load_config_file {
-    my $self = shift;
-    my ($file) = @_;
-    
-    my $config = Slic3r::Config->load($file);
-    $self->load_config($config);
-}
-
-sub load_config {
-    my $self = shift;
-    my ($config) = @_;
-    
-    foreach my $opt_key (@{$self->{config}->get_keys}) {
-        next unless $config->has($opt_key);
-        $self->{config}->set($opt_key, $config->get($opt_key));
-    }
-    $_->reload_config for @{$self->{optgroups}};
-    $self->_update;
-}
-
-sub load_presets {}
-
-sub is_dirty { 0 }
-sub config { $_[0]->{config}->clone }
-sub _update {}
-
-sub on_value_change {
-    my ($self, $cb) = @_;
-    $self->{on_value_change} = $cb;
-}
-
-sub on_presets_changed {}
-
-# propagate event to the parent
-sub _on_value_change {
-    my $self = shift;
-    
-    $self->{on_value_change}->(@_) if $self->{on_value_change};
-    $self->_update;
-}
-
-sub get_field {
-    my ($self, $opt_key, $opt_index) = @_;
-    
-    foreach my $optgroup (@{ $self->{optgroups} }) {
-        my $field = $optgroup->get_fieldc($opt_key, $opt_index);
-        return $field if defined $field;
-    }
-    return undef;
-}
-
-package Slic3r::GUI::SimpleTab::Print;
-use base 'Slic3r::GUI::SimpleTab';
-
-use Wx qw(:sizer);
-
-sub name { 'print' }
-sub title { 'Print Settings' }
-
-sub build {
-    my $self = shift;
-    
-    $self->init_config_options(qw(
-        layer_height perimeters top_solid_layers bottom_solid_layers 
-        fill_density fill_pattern top_infill_pattern bottom_infill_pattern
-        support_material support_material_spacing raft_layers
-        support_material_contact_distance dont_support_bridges
-        perimeter_speed infill_speed travel_speed
-        brim_width
-        xy_size_compensation
-    ));
-    
-    {
-        my $optgroup = $self->new_optgroup('General');
-        $optgroup->append_single_option_line('layer_height');
-        $optgroup->append_single_option_line('perimeters');
-        
-        my $line = Slic3r::GUI::OptionsGroup::Line->new(
-            label => 'Solid layers',
-        );
-        $line->append_option($optgroup->get_option('top_solid_layers'));
-        $line->append_option($optgroup->get_option('bottom_solid_layers'));
-        $optgroup->append_line($line);
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Infill');
-        $optgroup->append_single_option_line('fill_density');
-        $optgroup->append_single_option_line('fill_pattern');
-        $optgroup->append_single_option_line('top_infill_pattern');
-        $optgroup->append_single_option_line('bottom_infill_pattern');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Support material');
-        $optgroup->append_single_option_line('support_material');
-        $optgroup->append_single_option_line('support_material_spacing');
-        $optgroup->append_single_option_line('support_material_contact_distance');
-        $optgroup->append_single_option_line('dont_support_bridges');
-        $optgroup->append_single_option_line('raft_layers');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Speed');
-        $optgroup->append_single_option_line('perimeter_speed');
-        $optgroup->append_single_option_line('infill_speed');
-        $optgroup->append_single_option_line('travel_speed');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Brim');
-        $optgroup->append_single_option_line('brim_width');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Other');
-        $optgroup->append_single_option_line('xy_size_compensation');
-    }
-}
-
-sub _update {
-    my ($self) = @_;
-    
-    my $config = $self->{config};
-    
-    my $have_perimeters = $config->perimeters > 0;
-    $self->get_field($_)->toggle($have_perimeters)
-        for qw(perimeter_speed);
-    
-    my $have_infill = $config->fill_density > 0;
-    my $have_solid_infill = $config->top_solid_layers > 0 || $config->bottom_solid_layers > 0;
-    $self->get_field($_)->toggle($have_infill)
-        for qw(fill_pattern);
-    $self->get_field($_)->toggle($have_solid_infill)
-        for qw(top_infill_pattern bottom_infill_pattern);
-    $self->get_field($_)->toggle($have_infill || $have_solid_infill)
-        for qw(infill_speed);
-    
-    my $have_support_material = $config->support_material || $config->raft_layers > 0;
-    $self->get_field($_)->toggle($have_support_material)
-        for qw(support_material_spacing dont_support_bridges
-            support_material_contact_distance);
-}
-
-package Slic3r::GUI::SimpleTab::Filament;
-use base 'Slic3r::GUI::SimpleTab';
-
-sub name { 'filament' }
-sub title { 'Filament Settings' }
-
-sub build {
-    my $self = shift;
-    
-    $self->init_config_options(qw(
-        filament_diameter extrusion_multiplier
-        temperature first_layer_temperature bed_temperature first_layer_bed_temperature
-    ));
-    
-    {
-        my $optgroup = $self->new_optgroup('Filament');
-        $optgroup->append_single_option_line('filament_diameter', 0);
-        $optgroup->append_single_option_line('extrusion_multiplier', 0);
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Temperature (°C)');
-        
-        {
-            my $line = Slic3r::GUI::OptionsGroup::Line->new(
-                label => 'Extruder',
-            );
-            $line->append_option($optgroup->get_option('first_layer_temperature', 0));
-            $line->append_option($optgroup->get_option('temperature', 0));
-            $optgroup->append_line($line);
-        }
-        
-        {
-            my $line = Slic3r::GUI::OptionsGroup::Line->new(
-                label => 'Bed',
-            );
-            $line->append_option($optgroup->get_option('first_layer_bed_temperature'));
-            $line->append_option($optgroup->get_option('bed_temperature'));
-            $optgroup->append_line($line);
-        }
-    }
-}
-
-package Slic3r::GUI::SimpleTab::Printer;
-use base 'Slic3r::GUI::SimpleTab';
-use Wx qw(:sizer :button :bitmap :misc :id);
-use Wx::Event qw(EVT_BUTTON);
-
-sub name { 'printer' }
-sub title { 'Printer Settings' }
-
-sub build {
-    my $self = shift;
-    
-    $self->init_config_options(qw(
-        bed_shape
-        z_offset
-        gcode_flavor
-        nozzle_diameter
-        retract_length retract_lift wipe
-        start_gcode
-        end_gcode
-    ));
-    
-    {
-        my $bed_shape_widget = sub {
-            my ($parent) = @_;
-        
-            my $btn = Wx::Button->new($parent, -1, "Set…", wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
-            $btn->SetFont($Slic3r::GUI::small_font);
-            if ($Slic3r::GUI::have_button_icons) {
-                $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG));
-            }
-        
-            my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
-            $sizer->Add($btn);
-        
-            EVT_BUTTON($self, $btn, sub {
-                my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->{config}->bed_shape);
-                if ($dlg->ShowModal == wxID_OK) {
-                    my $value = $dlg->GetValue;
-                    $self->{config}->set('bed_shape', $value);
-                    $self->_on_value_change('bed_shape', $value);
-                }
-            });
-        
-            return $sizer;
-        };
-    
-        my $optgroup = $self->new_optgroup('Size and coordinates');
-        my $line = Slic3r::GUI::OptionsGroup::Line->new(
-            label       => 'Bed shape',
-            widget      => $bed_shape_widget,
-        );
-        $optgroup->append_line($line);
-        $optgroup->append_single_option_line('z_offset');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Firmware');
-        $optgroup->append_single_option_line('gcode_flavor');
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Extruder');
-        $optgroup->append_single_option_line('nozzle_diameter', 0);
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Retraction');
-        $optgroup->append_single_option_line('retract_length', 0);
-        $optgroup->append_single_option_line('retract_lift', 0);
-        $optgroup->append_single_option_line('wipe', 0);
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('Start G-code',
-            label_width => 0,
-        );
-        my $option = $optgroup->get_option('start_gcode');
-        $option->full_width(1);
-        $option->height(150);
-        $optgroup->append_single_option_line($option);
-    }
-    
-    {
-        my $optgroup = $self->new_optgroup('End G-code',
-            label_width => 0,
-        );
-        my $option = $optgroup->get_option('end_gcode');
-        $option->full_width(1);
-        $option->height(150);
-        $optgroup->append_single_option_line($option);
-    }
-}
-
-sub _update {
-    my ($self) = @_;
-    
-    my $config = $self->{config};
-    
-    my $have_retraction = $config->retract_length->[0] > 0;
-    $self->get_field($_, 0)->toggle($have_retraction)
-        for qw(retract_lift wipe);
-}
-
-1;
diff --git a/slic3r.pl b/slic3r.pl
index c881f95600..70f42aac04 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -36,8 +36,6 @@ my %cli_options = ();
         'autosave=s'            => \$opt{autosave},
         'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config},
         'no-controller'         => \$opt{no_controller},
-        'no-plater'             => \$opt{no_plater},
-        'gui-mode=s'            => \$opt{gui_mode},
         'datadir=s'             => \$opt{datadir},
         'export-svg'            => \$opt{export_svg},
         'merge|m'               => \$opt{merge},
@@ -78,28 +76,26 @@ if ($opt{load}) {
             $opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n";
         }
     }
+    
+    # expand shortcuts before applying, otherwise destination values would be already filled with defaults
+    $_->normalize for @external_configs;
 }
 
 # process command line options
-my $cli_config = Slic3r::Config->new;
-foreach my $c (@external_configs, Slic3r::Config->new_from_cli(%cli_options)) {
-    $c->normalize;  # expand shortcuts before applying, otherwise destination values would be already filled with defaults
-    $cli_config->apply($c);
-}
+my $cli_config = Slic3r::Config->new_from_cli(%cli_options);
+$cli_config->normalize;  # expand shortcuts
 
 # save configuration
 if ($opt{save}) {
-    if (@{$cli_config->get_keys} > 0) {
-        $cli_config->save($opt{save});
+    my $config = $cli_config->clone;
+    $config->apply($_) for @external_configs;
+    if (@{$config->get_keys} > 0) {
+        $config->save($opt{save});
     } else {
         Slic3r::Config->new_from_defaults->save($opt{save});
     }
 }
 
-# apply command line config on top of default config
-my $config = Slic3r::Config->new_from_defaults;
-$config->apply($cli_config);
-
 # launch GUI
 my $gui;
 if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
@@ -107,9 +103,7 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
         no warnings 'once';
         $Slic3r::GUI::datadir       = Slic3r::decode_path($opt{datadir} // '');
         $Slic3r::GUI::no_controller = $opt{no_controller};
-        $Slic3r::GUI::no_plater     = $opt{no_plater};
-        $Slic3r::GUI::mode          = $opt{gui_mode};
-        $Slic3r::GUI::autosave      = $opt{autosave};
+        $Slic3r::GUI::autosave      = Slic3r::decode_path($opt{autosave} // '');
         $Slic3r::GUI::threads       = $opt{threads};
     }
     $gui = Slic3r::GUI->new;
@@ -119,7 +113,7 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
         $gui->{mainframe}->load_config($cli_config);
         foreach my $input_file (@ARGV) {
             $input_file = Slic3r::decode_path($input_file);
-            $gui->{mainframe}{plater}->load_file($input_file) unless $opt{no_plater};
+            $gui->{mainframe}{plater}->load_file($input_file);
         }
     });
     $gui->MainLoop;
@@ -128,6 +122,9 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
 die $@ if $@ && $opt{gui};
 
 if (@ARGV) {  # slicing from command line
+    # apply command line config on top of default config
+    my $config = Slic3r::Config->new_from_defaults;
+    $config->apply($cli_config);
     $config->validate;
     
     if ($opt{repair}) {
@@ -330,7 +327,6 @@ $j
     --gui               Forces the GUI launch instead of command line slicing (if you
                         supply a model file, it will be loaded into the plater)
     --no-plater         Disable the plater tab
-    --gui-mode          Overrides the configured mode (simple/expert)
     --autosave <file>   Automatically export current configuration to the specified file
 
   Output options:
diff --git a/var/wand.png b/var/wand.png
new file mode 100755
index 0000000000..44ccbf8128
Binary files /dev/null and b/var/wand.png differ
diff --git a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp
index 2937f7d641..f18e4e0255 100644
--- a/xs/src/libslic3r/Config.cpp
+++ b/xs/src/libslic3r/Config.cpp
@@ -248,21 +248,24 @@ ConfigBase::has(const t_config_option_key &opt_key) {
 
 void
 ConfigBase::apply(const ConfigBase &other, bool ignore_nonexistent) {
-    // get list of option keys to apply
-    t_config_option_keys opt_keys = other.keys();
-    
+    // apply all options
+    this->apply_only(other, other.keys(), ignore_nonexistent);
+}
+
+void
+ConfigBase::apply_only(const ConfigBase &other, const t_config_option_keys &opt_keys, bool ignore_nonexistent) {
     // loop through options and apply them
-    for (t_config_option_keys::const_iterator it = opt_keys.begin(); it != opt_keys.end(); ++it) {
-        ConfigOption* my_opt = this->option(*it, true);
+    for (const t_config_option_key &opt_key : opt_keys) {
+        ConfigOption* my_opt = this->option(opt_key, true);
         if (my_opt == NULL) {
             if (ignore_nonexistent == false) throw "Attempt to apply non-existent option";
             continue;
         }
         
         // not the most efficient way, but easier than casting pointers to subclasses
-        bool res = my_opt->deserialize( other.option(*it)->serialize() );
+        bool res = my_opt->deserialize( other.option(opt_key)->serialize() );
         if (!res) {
-            std::string error = "Unexpected failure when deserializing serialized value for " + *it;
+            std::string error = "Unexpected failure when deserializing serialized value for " + opt_key;
             CONFESS(error.c_str());
         }
     }
@@ -524,6 +527,16 @@ DynamicConfig::erase(const t_config_option_key &opt_key) {
     this->options.erase(opt_key);
 }
 
+void
+DynamicConfig::clear() {
+    this->options.clear();
+}
+
+bool
+DynamicConfig::empty() const {
+    return this->options.empty();
+}
+
 void
 DynamicConfig::read_cli(const std::vector<std::string> &tokens, t_config_option_keys* extra)
 {
diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp
index 127efa06db..41d3cc668e 100644
--- a/xs/src/libslic3r/Config.hpp
+++ b/xs/src/libslic3r/Config.hpp
@@ -650,6 +650,7 @@ class ConfigBase
     virtual ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false) = 0;
     virtual t_config_option_keys keys() const = 0;
     void apply(const ConfigBase &other, bool ignore_nonexistent = false);
+    void apply_only(const ConfigBase &other, const t_config_option_keys &opt_keys, bool ignore_nonexistent = false);
     bool equals(ConfigBase &other);
     t_config_option_keys diff(ConfigBase &other);
     std::string serialize(const t_config_option_key &opt_key) const;
@@ -676,6 +677,8 @@ class DynamicConfig : public virtual ConfigBase
     virtual ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false);
     t_config_option_keys keys() const;
     void erase(const t_config_option_key &opt_key);
+    void clear();
+    bool empty() const;
     void read_cli(const std::vector<std::string> &tokens, t_config_option_keys* extra);
     void read_cli(const int argc, const char **argv, t_config_option_keys* extra);
     
diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp
index 2ab6ad89ec..c9fb48318b 100644
--- a/xs/src/libslic3r/PrintConfig.cpp
+++ b/xs/src/libslic3r/PrintConfig.cpp
@@ -25,6 +25,7 @@ PrintConfigDef::PrintConfigDef()
     
     def = this->add("avoid_crossing_perimeters", coBool);
     def->label = "Avoid crossing perimeters";
+    def->category = "Layers and Perimeters";
     def->tooltip = "Optimize travel moves in order to minimize the crossing of perimeters. 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->default_value = new ConfigOptionBool(false);
@@ -82,6 +83,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("bridge_acceleration", coFloat);
     def->label = "Bridge";
+    def->category = "Speed > Acceleration";
     def->tooltip = "This is the acceleration your printer will use for bridges. Set zero to disable acceleration control for bridges.";
     def->sidetext = "mm/s²";
     def->cli = "bridge-acceleration=f";
@@ -120,6 +122,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("brim_connections_width", coFloat);
     def->label = "Brim connections width";
+    def->category = "Skirt and brim";
     def->tooltip = "If set to a positive value, straight connections will be built on the first layer between adjacent objects.";
     def->sidetext = "mm";
     def->cli = "brim-connections-width=f";
@@ -128,14 +131,20 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("brim_width", coFloat);
     def->label = "Exterior brim width";
+    def->category = "Skirt and brim";
     def->tooltip = "Horizontal width of the brim that will be printed around each object on the first layer.";
     def->sidetext = "mm";
     def->cli = "brim-width=f";
     def->min = 0;
     def->default_value = new ConfigOptionFloat(0);
+    
+    def = this->add("compatible_printers", coStrings);
+    def->label = "Compatible printers";
+    def->default_value = new ConfigOptionStrings();
 
     def = this->add("complete_objects", coBool);
     def->label = "Complete individual objects";
+    def->category = "Advanced";
     def->tooltip = "When printing multiple objects or copies, this feature will complete each object before moving onto next one (and starting it from its bottom layer). 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->default_value = new ConfigOptionBool(false);
@@ -148,6 +157,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("default_acceleration", coFloat);
     def->label = "Default";
+    def->category = "Speed > Acceleration";
     def->tooltip = "This is the acceleration your printer will be reset to after the role-specific acceleration values are used (perimeter/infill). Set zero to prevent resetting acceleration at all.";
     def->sidetext = "mm/s²";
     def->cli = "default-acceleration=f";
@@ -501,6 +511,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("first_layer_acceleration", coFloat);
     def->label = "First layer";
+    def->category = "Speed > Acceleration";
     def->tooltip = "This is the acceleration your printer will use for first layer. Set zero to disable acceleration control for first layer.";
     def->sidetext = "mm/s²";
     def->cli = "first-layer-acceleration=f";
@@ -539,6 +550,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("first_layer_speed", coFloatOrPercent);
     def->label = "First layer speed";
+    def->category = "Speed";
     def->tooltip = "If expressed as absolute value in mm/s, this speed will be applied to all the print moves of the first layer, regardless of their type. If expressed as a percentage (for example: 40%) it will scale the default speeds.";
     def->sidetext = "mm/s or %";
     def->cli = "first-layer-speed=s";
@@ -610,6 +622,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("infill_acceleration", coFloat);
     def->label = "Infill";
+    def->category = "Speed > Acceleration";
     def->tooltip = "This is the acceleration your printer will use for infill. Set zero to disable acceleration control for infill.";
     def->sidetext = "mm/s²";
     def->cli = "infill-acceleration=f";
@@ -648,6 +661,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("infill_first", coBool);
     def->label = "Infill before perimeters";
+    def->category = "Infill";
     def->tooltip = "This option will switch the print order of perimeters and infill, making the latter first.";
     def->cli = "infill-first!";
     def->default_value = new ConfigOptionBool(false);
@@ -684,6 +698,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("interior_brim_width", coFloat);
     def->label = "Interior brim width";
+    def->category = "Skirt and brim";
     def->tooltip = "Horizontal width of the brim that will be printed inside object holes on the first layer.";
     def->sidetext = "mm";
     def->cli = "interior-brim-width=f";
@@ -726,6 +741,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("max_print_speed", coFloat);
     def->label = "Max print speed";
+    def->category = "Speed";
     def->tooltip = "When setting other speed settings to 0 Slic3r will autocalculate the optimal speed in order to keep constant extruder pressure. This experimental setting is used to set the highest print speed you want to allow.";
     def->sidetext = "mm/s";
     def->cli = "max-print-speed=f";
@@ -734,6 +750,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("max_volumetric_speed", coFloat);
     def->label = "Max volumetric speed";
+    def->category = "Speed";
     def->tooltip = "This experimental setting is used to set the maximum volumetric speed your extruder supports.";
     def->sidetext = "mm³/s";
     def->cli = "max-volumetric-speed=f";
@@ -759,6 +776,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("min_skirt_length", coFloat);
     def->label = "Minimum extrusion length";
+    def->category = "Skirt and brim";
     def->tooltip = "Generate no less than the number of skirt loops required to consume the specified amount of filament on the bottom layer. For multi-extruder machines, this minimum applies to each extruder.";
     def->sidetext = "mm";
     def->cli = "min-skirt-length=f";
@@ -790,7 +808,7 @@ PrintConfigDef::PrintConfigDef()
     def->tooltip = "Slic3r can upload G-code files to OctoPrint. This field should contain the API Key required for authentication.";
     def->cli = "octoprint-apikey=s";
     def->default_value = new ConfigOptionString("");
-    
+
     def = this->add("octoprint_host", coString);
     def->label = "Host or IP";
     def->tooltip = "Slic3r can upload G-code files to OctoPrint. This field should contain the hostname or IP address of the OctoPrint instance.";
@@ -799,12 +817,15 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("only_retract_when_crossing_perimeters", coBool);
     def->label = "Only retract when crossing perimeters";
+    def->category = "Layers and Perimeters";
     def->tooltip = "Disables retraction when the travel path does not exceed the upper layer's perimeters (and thus any ooze will be probably invisible).";
     def->cli = "only-retract-when-crossing-perimeters!";
     def->default_value = new ConfigOptionBool(true);
 
     def = this->add("ooze_prevention", coBool);
     def->label = "Enable";
+    def->full_label = "Ooze Prevention";
+    def->category = "Extruders";
     def->tooltip = "During multi-extruder prints, this option will drop the temperature of the inactive extruders to prevent oozing. It will enable a tall skirt automatically and move extruders outside such skirt when changing temperatures.";
     def->cli = "ooze-prevention!";
     def->default_value = new ConfigOptionBool(false);
@@ -822,9 +843,18 @@ PrintConfigDef::PrintConfigDef()
     def->tooltip = "Experimental option to adjust flow for overhangs (bridge flow will be used), to apply bridge speed to them and enable fan.";
     def->cli = "overhangs|detect-bridging-perimeters!";
     def->default_value = new ConfigOptionBool(true);
+    
+    def = this->add("overridable", coStrings);
+    def->label = "Overridable options";
+    {
+        ConfigOptionStrings* opt = new ConfigOptionStrings();
+        opt->values.push_back("support_material");
+        def->default_value = opt;
+    }
 
     def = this->add("perimeter_acceleration", coFloat);
     def->label = "Perimeters";
+    def->category = "Speed > Acceleration";
     def->tooltip = "This is the acceleration your printer will use for perimeters. A high value like 9000 usually gives good results if your hardware is up to the job. Set zero to disable acceleration control for perimeters.";
     def->sidetext = "mm/s²";
     def->cli = "perimeter-acceleration=f";
@@ -882,6 +912,7 @@ PrintConfigDef::PrintConfigDef()
     def->multiline = true;
     def->full_width = true;
     def->height = 60;
+    def->default_value = new ConfigOptionStrings();
 
     def = this->add("print_settings_id", coString);
     def->default_value = new ConfigOptionString("");
@@ -891,6 +922,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("pressure_advance", coFloat);
     def->label = "Pressure advance";
+    def->category = "Extruder";
     def->tooltip = "When set to a non-zero value, this experimental option enables pressure regulation. It's the K constant for the advance algorithm that pushes more or less filament upon speed changes. It's useful for Bowden-tube extruders. Reasonable values are in range 0-10.";
     def->cli = "pressure-advance=f";
     def->min = 0;
@@ -924,6 +956,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("retract_before_travel", coFloats);
     def->label = "Minimum travel after retraction";
+    def->category = "Retraction";
     def->tooltip = "Retraction is not triggered when travel moves are shorter than this length.";
     def->sidetext = "mm";
     def->cli = "retract-before-travel=f@";
@@ -935,6 +968,7 @@ PrintConfigDef::PrintConfigDef()
     
     def = this->add("retract_layer_change", coBools);
     def->label = "Retract on layer change";
+    def->category = "Retraction";
     def->tooltip = "This flag enforces a retraction whenever a Z move is done.";
     def->cli = "retract-layer-change!";
     {
@@ -945,6 +979,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("retract_length", coFloats);
     def->label = "Length";
+    def->category = "Retraction";
     def->full_label = "Retraction Length";
     def->tooltip = "When retraction is triggered, filament is pulled back by the specified amount (the length is measured on raw filament, before it enters the extruder).";
     def->sidetext = "mm (zero to disable)";
@@ -969,6 +1004,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("retract_lift", coFloats);
     def->label = "Lift Z";
+    def->category = "Retraction";
     def->tooltip = "If you set this to a positive value, Z is quickly raised every time a retraction is triggered. When using multiple extruders, only the setting for the first extruder will be considered.";
     def->sidetext = "mm";
     def->cli = "retract-lift=f@";
@@ -981,6 +1017,7 @@ PrintConfigDef::PrintConfigDef()
     def = this->add("retract_lift_above", coFloats);
     def->label = "Above Z";
     def->full_label = "Only lift Z above";
+    def->category = "Retraction";
     def->tooltip = "If you set this to a positive value, Z lift will only take place above the specified absolute Z. You can tune this setting for skipping lift on the first layers.";
     def->sidetext = "mm";
     def->cli = "retract-lift-above=f@";
@@ -993,6 +1030,7 @@ PrintConfigDef::PrintConfigDef()
     def = this->add("retract_lift_below", coFloats);
     def->label = "Below Z";
     def->full_label = "Only lift Z below";
+    def->category = "Retraction";
     def->tooltip = "If you set this to a positive value, Z lift will only take place below the specified absolute Z. You can tune this setting for limiting lift to the first layers.";
     def->sidetext = "mm";
     def->cli = "retract-lift-below=f@";
@@ -1004,6 +1042,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("retract_restart_extra", coFloats);
     def->label = "Extra length on restart";
+    def->category = "Retraction";
     def->tooltip = "When the retraction is compensated after the travel move, the extruder will push this additional amount of filament. This setting is rarely needed.";
     def->sidetext = "mm";
     def->cli = "retract-restart-extra=f@";
@@ -1026,7 +1065,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("retract_speed", coFloats);
     def->label = "Speed";
-    def->full_label = "Retraction Speed";
+    def->category = "Retraction";
     def->tooltip = "The speed for retractions (it only applies to the extruder motor). If you use the Firmware Retraction option, please note this value still affects the auto-speed pressure regulator.";
     def->sidetext = "mm/s";
     def->cli = "retract-speed=f@";
@@ -1038,7 +1077,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("seam_position", coEnum);
     def->label = "Seam position";
-    def->category = "Layers and perimeters";
+    def->category = "Layers and Perimeters";
     def->tooltip = "Position of perimeters starting points.";
     def->cli = "seam-position=s";
     def->enum_keys_map = ConfigOptionEnum<SeamPosition>::get_enum_values();
@@ -1076,6 +1115,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("skirt_distance", coFloat);
     def->label = "Distance from object";
+    def->category = "Skirt and brim";
     def->tooltip = "Distance between skirt and object(s). Set this to zero to attach the skirt to the object(s) and get a brim for better adhesion.";
     def->sidetext = "mm";
     def->cli = "skirt-distance=f";
@@ -1084,6 +1124,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("skirt_height", coInt);
     def->label = "Skirt height";
+    def->category = "Skirt and brim";
     def->tooltip = "Height of skirt expressed in layers. Set this to a tall value to use skirt as a shield against drafts.";
     def->sidetext = "layers";
     def->cli = "skirt-height=i";
@@ -1091,6 +1132,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("skirts", coInt);
     def->label = "Loops (minimum)";
+    def->category = "Skirt and brim";
     def->full_label = "Skirt Loops";
     def->tooltip = "Number of loops for the skirt. If the Minimum Extrusion Length option is set, the number of loops might be greater than the one configured here. Set this to zero to disable skirt completely.";
     def->cli = "skirts=i";
@@ -1185,12 +1227,15 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("spiral_vase", coBool);
     def->label = "Spiral vase";
+    def->category = "Layers and Perimeters";
     def->tooltip = "This feature will raise Z gradually while printing a single-walled object in order to remove any visible seam. This option requires a single perimeter, no infill, no top solid layers and no support material. You can still set any number of bottom solid layers as well as skirt/brim loops. It won't work when printing more than an object.";
     def->cli = "spiral-vase!";
     def->default_value = new ConfigOptionBool(false);
 
     def = this->add("standby_temperature_delta", coInt);
     def->label = "Temperature variation";
+    def->full_label = "Standby temperature delta";
+    def->category = "Extruders";
     def->tooltip = "Temperature difference to be applied when an extruder is not active.  Enables a full-height \"sacrificial\" skirt on which the nozzles are periodically wiped.";
     def->sidetext = "∆°C";
     def->cli = "standby-temperature-delta=i";
@@ -1309,6 +1354,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("support_material_interface_speed", coFloatOrPercent);
     def->label = "↳ interface";
+    def->label = "Interface Speed";
     def->category = "Support material interface speed";
     def->gui_type = "f_enum_open";
     def->category = "Support material";
@@ -1456,6 +1502,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("travel_speed", coFloat);
     def->label = "Travel";
+    def->category = "Speed";
     def->tooltip = "Speed for travel moves (jumps between distant extrusion points).";
     def->sidetext = "mm/s";
     def->cli = "travel-speed=f";
@@ -1491,6 +1538,7 @@ PrintConfigDef::PrintConfigDef()
 
     def = this->add("wipe", coBools);
     def->label = "Wipe while retracting";
+    def->category = "Retraction";
     def->tooltip = "This flag will move the nozzle while retracting to minimize the possible blob on leaky extruders.";
     def->cli = "wipe!";
     {
@@ -1647,7 +1695,7 @@ PrintConfigBase::_handle_legacy(t_config_option_key &opt_key, std::string &value
     }
     
     if (!this->def->has(opt_key)) {
-        printf("Unknown option %s\n", opt_key.c_str());
+        //printf("Unknown option %s\n", opt_key.c_str());
         opt_key = "";
         return;
     }
diff --git a/xs/xsp/Config.xsp b/xs/xsp/Config.xsp
index 6b4fb19509..6744a1e104 100644
--- a/xs/xsp/Config.xsp
+++ b/xs/xsp/Config.xsp
@@ -27,14 +27,20 @@
         double get_abs_value(t_config_option_key opt_key, double ratio_over);
     void apply(DynamicPrintConfig* other)
         %code{% THIS->apply(*other, true); %};
+    void apply_only(DynamicPrintConfig* other, std::vector<std::string> opt_keys)
+        %code{% THIS->apply_only(*other, opt_keys, true); %};
     std::vector<std::string> diff(DynamicPrintConfig* other)
         %code{% RETVAL = THIS->diff(*other); %};
+    std::vector<std::string> diff_static(StaticPrintConfig* other)
+        %code{% RETVAL = THIS->diff(*other); %};
     bool equals(DynamicPrintConfig* other)
         %code{% RETVAL = THIS->equals(*other); %};
     void apply_static(StaticPrintConfig* other)
         %code{% THIS->apply(*other, true); %};
     %name{get_keys} std::vector<std::string> keys();
     void erase(t_config_option_key opt_key);
+    void clear();
+    bool empty();
     void normalize();
     %name{setenv} void setenv_();
     double min_object_distance();
diff --git a/xs/xsp/Print.xsp b/xs/xsp/Print.xsp
index c4590a69e3..601bd57a20 100644
--- a/xs/xsp/Print.xsp
+++ b/xs/xsp/Print.xsp
@@ -257,6 +257,12 @@ _constant()
     void add_model_object(ModelObject* model_object, int idx = -1);
     bool apply_config(DynamicPrintConfig* config)
         %code%{ RETVAL = THIS->apply_config(*config); %};
+    bool apply_static_config(StaticPrintConfig* config)
+        %code%{
+            DynamicPrintConfig dpc;
+            dpc.apply(*config);
+            RETVAL = THIS->apply_config(dpc);
+        %};
     bool has_infinite_skirt();
     bool has_skirt();
     std::string _validate()