diff --git a/src/dialogs/profilesdialog.h b/src/dialogs/profilesdialog.h
--- a/src/dialogs/profilesdialog.h
+++ b/src/dialogs/profilesdialog.h
@@ -30,8 +30,7 @@
     Q_OBJECT
 
 public:
-    explicit ProfilesDialog(QWidget *parent = nullptr);
-    void setBaudRates(const QStringList &list);
+    explicit ProfilesDialog(const QStringList &firmwares, const QStringList &baudList, QWidget *parent = nullptr);
     ~ProfilesDialog();
 
 private:
diff --git a/src/dialogs/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp
--- a/src/dialogs/profilesdialog.cpp
+++ b/src/dialogs/profilesdialog.cpp
@@ -20,12 +20,15 @@
 #include <QMessageBox>
 #include <KLocalizedString>
 
-ProfilesDialog::ProfilesDialog(QWidget *parent) :
+ProfilesDialog::ProfilesDialog(const QStringList &firmwares, const QStringList &baudList, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ProfilesDialog)
 {
     ui->setupUi(this);
-
+    ui->firmwareCB->addItem(QStringLiteral("Auto-Detect"));
+    ui->firmwareCB->addItems(firmwares);
+    ui->baudCB->addItems(baudList);
+    ui->baudCB->setCurrentText(QLatin1String("115200"));
     ui->profileCB->setAutoCompletion(true);
     connect(ui->profileCB, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [ = ] {
         loadSettings();
@@ -67,12 +70,6 @@
 #endif
 }
 
-void ProfilesDialog::setBaudRates(const QStringList &list)
-{
-    ui->baudCB->addItems(list);
-    ui->baudCB->setCurrentText(QLatin1String("115200"));
-}
-
 ProfilesDialog::~ProfilesDialog()
 {
     delete ui;
@@ -109,11 +106,12 @@
     }
 
     settings.setValue(QStringLiteral("heatedBed"), ui->heatedBedCK->isChecked());
-    settings.setValue(QStringLiteral("temperatureBed"), ui->bedTempSB->value());
+    settings.setValue(QStringLiteral("maximumTemperatureBed"), ui->bedTempSB->value());
     //HOTEND
-    settings.setValue(QStringLiteral("temperatureExtruder"), ui->extruderTempSB->value());
+    settings.setValue(QStringLiteral("maximumTemperatureExtruder"), ui->extruderTempSB->value());
     //Baud
     settings.setValue(QStringLiteral("bps"), ui->baudCB->currentText());
+    settings.setValue(QStringLiteral("firmware"),ui->firmwareCB->currentText());
     settings.endGroup();
     settings.endGroup();
 
@@ -150,12 +148,13 @@
 
     ui->heatedBedCK->setChecked(settings.value(QStringLiteral("heatedBed"), QStringLiteral("true")).toBool());
     ui->bedTempSB->setEnabled(ui->heatedBedCK->isChecked());
-    ui->bedTempSB->setValue(settings.value(QStringLiteral("temperatureBed"), QStringLiteral("0")).toFloat());
+    ui->bedTempSB->setValue(settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0")).toInt());
 
     //HOTEND
-    ui->extruderTempSB->setValue(settings.value(QStringLiteral("temperatureExtruder"), QStringLiteral("0.0")).toFloat());
+    ui->extruderTempSB->setValue(settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0")).toInt());
     //Baud
     ui->baudCB->setCurrentText(settings.value(QStringLiteral("bps"), QStringLiteral("115200")).toString());
+    ui->firmwareCB->setCurrentText(settings.value(QStringLiteral("firmware"), QStringLiteral("Auto-Detect")).toString());
     settings.endGroup();
     settings.endGroup();
 
diff --git a/src/dialogs/profilesdialog.ui b/src/dialogs/profilesdialog.ui
--- a/src/dialogs/profilesdialog.ui
+++ b/src/dialogs/profilesdialog.ui
@@ -228,34 +228,34 @@
           <item row="1" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
-             <string>Bed</string>
+             <string>Maximum Bed</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1" colspan="2">
-           <widget class="QDoubleSpinBox" name="bedTempSB">
+           <widget class="QSpinBox" name="bedTempSB">
             <property name="suffix">
              <string> ºC</string>
             </property>
             <property name="maximum">
-             <double>200.000000000000000</double>
+             <number>999</number>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
-             <string>Hotend</string>
+             <string>Maximum Hotend</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1" colspan="2">
-           <widget class="QDoubleSpinBox" name="extruderTempSB">
+           <widget class="QSpinBox" name="extruderTempSB">
             <property name="suffix">
              <string> ºC</string>
             </property>
             <property name="maximum">
-             <double>400.000000000000000</double>
+             <number>999</number>
             </property>
            </widget>
           </item>
@@ -268,7 +268,31 @@
       <attribute name="title">
        <string>Advanced</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_7"/>
+       <layout class="QGridLayout" name="gridLayout_7">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Firmware</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="firmwareCB"/>
+        </item>
+        <item row="1" column="0">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
      </widget>
     </widget>
    </item>
diff --git a/src/mainwindow.h b/src/mainwindow.h
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -22,7 +22,6 @@
 #include <AtCore/AtCore>
 #include <KXmlGui/KXmlGuiWindow>
 #include <dialogs/connectsettingsdialog.h>
-#include <dialogs/profilesdialog.h>
 #include <widgets/logwidget.h>
 namespace Ui
 {
@@ -42,7 +41,6 @@
     AtCore core;
     QStringList firmwaresList;
     QUrl fileName;
-    ProfilesDialog *profilesDialog;
     ConnectSettingsDialog *connectSettingsDialog;
     LogWidget *logWidget;
     QAction *_connect;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -25,11 +25,11 @@
 #include <KXMLGUIFactory>
 #include <AtCore/SerialLayer>
 #include <AtCore/GCodeCommands>
+#include <dialogs/profilesdialog.h>
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
     ui(new Ui::MainWindow),
-    profilesDialog(new ProfilesDialog(this)),
     connectSettingsDialog(new ConnectSettingsDialog(this))
 {
     ui->setupUi(this);
@@ -114,11 +114,11 @@
     ui->statusBar->addWidget(ui->statusBarWidget);
 
     // When a new profile is added on the Profile Dialog it needs to update the profiles on connection dialog
+    /*
     connect(profilesDialog, &ProfilesDialog::updateProfiles,
             connectSettingsDialog, &ConnectSettingsDialog::updateProfiles);
-
+    */
     connectSettingsDialog->setFirmwareList(core.availableFirmwarePlugins());
-    profilesDialog->setBaudRates(core.serial()->validBaudRates());
 
     ui->homeAllPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     ui->homeXPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
@@ -172,7 +172,10 @@
 
     action = actionCollection()->addAction(QStringLiteral("profiles"));
     action->setText(i18n("&Profiles"));
-    connect(action, &QAction::triggered, profilesDialog, &ProfilesDialog::show);
+    connect(action, &QAction::triggered, [&] {
+        std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog(core.availableFirmwarePlugins(),core.portSpeeds()));
+        pd.get()->exec();
+    });
 
     action = actionCollection()->addAction(QStringLiteral("print"));
     action->setText(i18n("&Print"));