diff --git a/src/dialogs/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp
index fd4fcbf..97e80c2 100644
--- a/src/dialogs/profilesdialog.cpp
+++ b/src/dialogs/profilesdialog.cpp
@@ -1,190 +1,189 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "profilesdialog.h"
 #include "ui_profilesdialog.h"
 #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();
     });
     updateCBProfiles();
 
     connect(ui->buttonBox, &QDialogButtonBox::clicked, [ = ](QAbstractButton * btn) {
         switch (ui->buttonBox->buttonRole(btn)) {
         case QDialogButtonBox::ResetRole:
             loadSettings();
             break;
         case QDialogButtonBox::RejectRole:
                 close();
             break;
         default:
             break;
         }
     });
 
     connect(ui->heatedBedCK, &QCheckBox::clicked, [ = ](const bool & status) {
         ui->bedTempSB->setEnabled(status);
     });
 
     connect(ui->cartesianRB, &QRadioButton::clicked, [ = ]() {
         ui->cartesianGB->setHidden(false);
         ui->deltaGB->setHidden(true);
     });
 
     connect(ui->deltaRB, &QRadioButton::clicked, [ = ]() {
         ui->cartesianGB->setHidden(true);
         ui->deltaGB->setHidden(false);
     });
 
     connect(ui->removeProfilePB, &QPushButton::clicked, this, &ProfilesDialog::removeProfile);
 #ifdef Q_OS_LINUX
     ui->removeProfilePB->setIcon(QIcon::fromTheme("edit-delete"));
 #else
     ui->removeProfilePB->setIcon(style()->standardIcon(QStyle::SP_TrashIcon));
 #endif
 }
 
-void ProfilesDialog::setBaudRates(const QStringList &list)
-{
-    ui->baudCB->addItems(list);
-    ui->baudCB->setCurrentText(QLatin1String("115200"));
-}
-
 ProfilesDialog::~ProfilesDialog()
 {
     delete ui;
 }
 
 void ProfilesDialog::saveSettings()
 {
     settings.beginGroup(QStringLiteral("GeneralSettings"));
     QStringList groups = settings.childGroups();
     settings.endGroup();
     QString currentProfile = ui->profileCB->currentText();
     if (groups.contains(currentProfile)) {
         int ret = QMessageBox::information(this, i18n("Save?"),
                                            i18n("A profile with this name already exists. \n Are you sure you want to overwrite it?"),
                                            QMessageBox::Save, QMessageBox::Cancel);
         if (ret == QMessageBox::Cancel) {
             return;
         }
     }
     //Add indent to better view of the data
     settings.beginGroup(QStringLiteral("GeneralSettings"));
     settings.beginGroup(currentProfile);
     //BED
     if (ui->cartesianRB->isChecked()) {
         settings.setValue(QStringLiteral("isCartesian"), true);
         settings.setValue(QStringLiteral("dimensionX"), ui->x_dimensionSB->value());
         settings.setValue(QStringLiteral("dimensionY"), ui->y_dimensionSB->value());
         settings.setValue(QStringLiteral("dimensionZ"), ui->z_dimensionSB->value());
     }
     else {
         settings.setValue(QStringLiteral("isCartesian"), false);
         settings.setValue(QStringLiteral("radius"), ui->radiusSB->value());
         settings.setValue(QStringLiteral("z_delta_dimension"), ui->z_dimensionSB->value());
     }
 
     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();
 
     //Load new profile
     updateCBProfiles();
     loadSettings(currentProfile);
     emit updateProfiles();
 }
 
 void ProfilesDialog::loadSettings(const QString &currentProfile)
 {
     settings.beginGroup(QStringLiteral("GeneralSettings"));
     const QString profileName = currentProfile.isEmpty() ? ui->profileCB ->currentText() : currentProfile;
     ui->profileCB->setCurrentText(profileName);
     settings.beginGroup(profileName);
 
     //BED
     if (settings.value(QStringLiteral("isCartesian")).toBool()) {
         ui->cartesianGB->setHidden(false);
         ui->cartesianRB->setChecked(true);
         ui->deltaRB->setChecked(false);
         ui->deltaGB->setHidden(true);
         ui->x_dimensionSB->setValue(settings.value(QStringLiteral("dimensionX"), QStringLiteral("0")).toInt());
         ui->y_dimensionSB->setValue(settings.value(QStringLiteral("dimensionY"), QStringLiteral("0")).toInt());
         ui->z_dimensionSB->setValue(settings.value(QStringLiteral("dimensionZ"), QStringLiteral("0")).toInt());
     } else {
         ui->deltaGB->setHidden(false);
         ui->deltaRB->setChecked(true);
         ui->cartesianRB->setChecked(false);
         ui->cartesianGB->setHidden(true);
         ui->radiusSB->setValue(settings.value(QStringLiteral("radius"), QStringLiteral("0")).toFloat());
         ui->z_delta_dimensionSB->setValue(settings.value(QStringLiteral("z_delta_dimension"), QStringLiteral("0")).toFloat());
     }
 
     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();
 
 }
 
 void ProfilesDialog::updateCBProfiles()
 {
     settings.beginGroup(QStringLiteral("GeneralSettings"));
     QStringList groups = settings.childGroups();
     settings.endGroup();
     if (groups.isEmpty()) {
         ui->deltaGB->setHidden(true);
     }
     ui->profileCB->clear();
     ui->profileCB->addItems(groups);
 }
 
 void ProfilesDialog::accept()
 {
     saveSettings();
 }
 
 void ProfilesDialog::removeProfile(){
     QString currentProfile = ui->profileCB->currentText();
     settings.beginGroup(QStringLiteral("GeneralSettings"));
     settings.beginGroup(currentProfile);
     settings.remove("");
     settings.endGroup();
     settings.remove(currentProfile);
     settings.endGroup();
     updateCBProfiles();
 }
diff --git a/src/dialogs/profilesdialog.h b/src/dialogs/profilesdialog.h
index c171024..ae4b10d 100644
--- a/src/dialogs/profilesdialog.h
+++ b/src/dialogs/profilesdialog.h
@@ -1,47 +1,46 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
 #include <QDialog>
 #include <QSettings>
 
 namespace Ui
 {
 class ProfilesDialog;
 }
 
 class ProfilesDialog : public QDialog
 {
     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:
     Ui::ProfilesDialog *ui;
     void saveSettings();
     void loadSettings(const QString &currentProfile = QString());
     QSettings settings;
     void updateCBProfiles();
     void accept();
     void removeProfile();
 signals:
     void updateProfiles();
 };
diff --git a/src/dialogs/profilesdialog.ui b/src/dialogs/profilesdialog.ui
index bd6b0ee..305a937 100644
--- a/src/dialogs/profilesdialog.ui
+++ b/src/dialogs/profilesdialog.ui
@@ -1,334 +1,358 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProfilesDialog</class>
  <widget class="QDialog" name="ProfilesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>301</width>
     <height>622</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Profiles</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout_3">
      <item row="0" column="0">
       <widget class="QLabel" name="label_20">
        <property name="text">
         <string>Profile</string>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="QRadioButton" name="cartesianRB">
        <property name="text">
         <string>&amp;Cartesian</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Printer Type</string>
        </property>
       </widget>
      </item>
      <item row="3" column="2">
       <widget class="QRadioButton" name="deltaRB">
        <property name="text">
         <string>Delta</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1" colspan="2">
       <widget class="QComboBox" name="profileCB">
        <property name="editable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="0" column="3">
       <widget class="QPushButton" name="removeProfilePB">
        <property name="toolTip">
         <string>Remove Profile</string>
        </property>
        <property name="toolTipDuration">
         <number>2</number>
        </property>
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label_9">
        <property name="text">
         <string>Bits per second</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="baudCB"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>General</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_6">
        <item row="0" column="0">
         <widget class="QGroupBox" name="deltaGB">
          <property name="title">
           <string>Dimension</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="1" column="0">
            <widget class="QLabel" name="label_14">
             <property name="text">
              <string>Dimension Z</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
              <string>Radius</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="radiusSB">
             <property name="suffix">
              <string> mm</string>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="z_delta_dimensionSB">
             <property name="suffix">
              <string> mm</string>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="cartesianGB">
          <property name="title">
           <string>Dimension</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="2" column="1">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Dimension Z</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Dimension Y</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Dimension X</string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QSpinBox" name="x_dimensionSB">
             <property name="suffix">
              <string> mm</string>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
            </widget>
           </item>
           <item row="2" column="2">
            <widget class="QSpinBox" name="z_dimensionSB">
             <property name="suffix">
              <string> mm</string>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
            </widget>
           </item>
           <item row="1" column="2">
            <widget class="QSpinBox" name="y_dimensionSB">
             <property name="suffix">
              <string> mm</string>
             </property>
             <property name="maximum">
              <number>999999999</number>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="bedTempsGB">
          <property name="title">
           <string>Temperatures</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_5">
           <item row="0" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
              <string>Heated bed?</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QCheckBox" name="heatedBedCK">
             <property name="text">
              <string/>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <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>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
       <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>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::Close|QDialogButtonBox::Reset|QDialogButtonBox::Save</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>profileCB</tabstop>
   <tabstop>cartesianRB</tabstop>
   <tabstop>deltaRB</tabstop>
   <tabstop>radiusSB</tabstop>
   <tabstop>z_delta_dimensionSB</tabstop>
   <tabstop>x_dimensionSB</tabstop>
   <tabstop>y_dimensionSB</tabstop>
   <tabstop>z_dimensionSB</tabstop>
   <tabstop>heatedBedCK</tabstop>
   <tabstop>bedTempSB</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>ProfilesDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ProfilesDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ac74271..e13fd90 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,384 +1,385 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
             Chris Rizzitello - rizzitello@kde.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KXMLGUIFactory>
 #include <AtCore/SerialLayer>
 #include <AtCore/GCodeCommands>
 #include <dialogs/connectsettingsdialog.h>
+#include <dialogs/profilesdialog.h>
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
-    ui(new Ui::MainWindow),
-    profilesDialog(new ProfilesDialog(this))
+    ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
     logWidget = new LogWidget;
     setupActions();
     initConnectsToAtCore();
     initWidgets();
     setCentralWidget(nullptr);
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
 
 void MainWindow::initConnectsToAtCore()
 {
     // Handle AtCore status change
     connect(&core, &AtCore::stateChanged, this, &MainWindow::handlePrinterStatusChanged);
 
     // If the number of extruders from the printer change, we need to update the radiobuttons on the widget
     connect(this, &MainWindow::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount);
 
     // Bed and Extruder temperatures management
     connect(ui->bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &core, &AtCore::setBedTemp);
     connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &core, &AtCore::setExtruderTemp);
 
     // Connect AtCore temperatures changes on Atelier Plot
     connect(&core.temperature(), &Temperature::bedTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x00, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTemp(temp);
     });
     connect(&core.temperature(), &Temperature::bedTargetTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x01, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTargetTemp(temp);
     });
     connect(&core.temperature(), &Temperature::extruderTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x02, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTemp(temp);
     });
     connect(&core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x03, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTargetTemp(temp);
     });
 
     connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ = ](QString command) {
         logWidget->addLog("Push " + command);
         core.pushCommand(command);
     });
 
     // Fan, Flow and Speed management
     connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &core, &AtCore::setFanSpeed);
     connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &core, &AtCore::setFlowRate);
     connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &core, &AtCore::setPrinterSpeed);
     connect(ui->axisViewWidget, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
 
 }
 
 void MainWindow::initWidgets()
 {
     // Disable Toolbox to prevent the user to mess up without a printer being connected
     ui->controlDockWidget->setDisabled(true);
     ui->axisDockWidget->setDisabled(true);
 
     // This dock is of Printing Progress. It only need to be show while printing
     ui->printProgressDockWidget->setVisible(false);
 
     ui->logDockWidget->setWidget(logWidget);
     ui->statusBar->addWidget(ui->statusBarWidget);
 
-    profilesDialog->setBaudRates(core.serial()->validBaudRates());
-
     ui->homeAllPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     ui->homeXPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     ui->homeYPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     ui->homeZPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
 
     tabifyDockWidget(ui->axisDockWidget, ui->controlDockWidget);
     tabifyDockWidget(ui->view3DdockWidget, ui->gcodeDockWidget);
     tabifyDockWidget(ui->view3DdockWidget, ui->videoDockWidget);
 }
 
 void MainWindow::setupActions()
 {
     // Actions for the Toolbar
     QAction *action;
     action = actionCollection()->addAction(QStringLiteral("open_gcode"));
     action->setText(i18n("&Open GCode"));
     connect(action, &QAction::triggered, this, &MainWindow::openFile);
 
     _connect = actionCollection()->addAction(QStringLiteral("connect"));
     _connect->setText(i18n("&Connect"));
     _connect->setCheckable(true);
     connect(_connect, &QAction::toggled, [ = ](bool checked) {
         if (checked) {
             std::unique_ptr<ConnectSettingsDialog> csd(new ConnectSettingsDialog);
             connect(csd.get(), &ConnectSettingsDialog::startConnection, [ & ](QString port, QMap<QString, QVariant> data) {
                 core.initSerial(port, data["bps"].toInt());
             });
             csd->exec();
         } else {
             core.closeConnection();
             _connect->setText(i18n("&Connect"));
             ui->bedExtWidget->stopHeating();
             core.setState(AtCore::DISCONNECTED);
         }
     });
 
     connect(ui->homeAllPB, &QPushButton::clicked, [=]{
         core.home();
     });
 
     connect(ui->homeXPB, &QPushButton::clicked, [=]{
        core.home(AtCore::X);
     });
 
     connect(ui->homeYPB, &QPushButton::clicked, [=]{
        core.home(AtCore::Y);
     });
 
     connect(ui->homeZPB, &QPushButton::clicked, [=]{
        core.home(AtCore::Z);
     });
 
     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->exec();
+    });
 
     action = actionCollection()->addAction(QStringLiteral("print"));
     action->setText(i18n("&Print"));
     connect(action, &QAction::triggered, this, &MainWindow::printFile);
 
     action = actionCollection()->addAction(QStringLiteral("pause"));
     action->setText(i18n("&Pause"));
     connect(action, &QAction::triggered, this, &MainWindow::pausePrint);
 
     action = actionCollection()->addAction(QStringLiteral("stop"));
     action->setText(i18n("&Stop"));
     connect(action, &QAction::triggered, this, &MainWindow::stopPrint);
 
     #ifdef Q_OS_LINUX
     //only set icons from theme on linux
         actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite"));
     #endif
     //use style's standardIcon for the icons we can.
     actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
     actionCollection()->action(QStringLiteral("print"))->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
     actionCollection()->action(QStringLiteral("pause"))->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
     actionCollection()->action(QStringLiteral("stop"))->setIcon(style()->standardIcon(QStyle::SP_MediaStop));
 
     // Actions for the Docks
     action = actionCollection()->addAction(QStringLiteral("dock_labels"));
     action->setText(i18n("&Show Dock Labels"));
     action->setCheckable(true); 
     action->setChecked(true);
     connect(action, &QAction::triggered, [=](bool checked){
         toggleDockTitles(checked);
     });
 
     action = actionCollection()->addAction(QStringLiteral("3d"), ui->view3DdockWidget->toggleViewAction());
     action->setText(i18n("&3DView"));
 
     action = actionCollection()->addAction(QStringLiteral("gcode"), ui->gcodeDockWidget->toggleViewAction());
     action->setText(i18n("&GCode"));
 
     action = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
 
     // Plot
     action = actionCollection()->addAction(QStringLiteral("plot"), ui->plotDockWidget->toggleViewAction());
     action->setText(i18n("Temperature Timeline"));
 
     action = actionCollection()->addAction(QStringLiteral("controller"), ui->controlDockWidget->toggleViewAction());
     action->setText(i18n("Controller"));
 
     action = actionCollection()->addAction(QStringLiteral("axis"), ui->axisDockWidget->toggleViewAction());
     action->setText(i18n("Axis"));
     
     action = actionCollection()->addAction(QStringLiteral("video"), ui->videoDockWidget->toggleViewAction());
     action->setText(i18n("Video Monitor"));
     
     action = actionCollection()->addAction(QStringLiteral("log"), ui->logDockWidget->toggleViewAction());
     action->setText(i18n("Log"));
 
     setupGUI(Default, ":/atelierui");
 }
 
 void MainWindow::openFile()
 {
     QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
                               QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
     if (!fileNameFromDialog.isEmpty()) {
         fileName = fileNameFromDialog;
         ui->gcodeEditorWidget->loadFile(fileName);
         guiFactory()->addClient(ui->gcodeEditorWidget->gcodeView());
         ui->view3DWidget->drawModel(fileName.toString());
     }
 }
 
 void MainWindow::printFile()
 {
     if (!fileName.isEmpty() && (core.state() == AtCore::IDLE)) {
         QString f = fileName.toLocalFile();
         core.print(f);
     }
 }
 
 void MainWindow::pausePrint()
 {
     core.pause(QString());
 }
 
 void MainWindow::stopPrint()
 {
     core.stop();
 }
 
 void MainWindow::handlePrinterStatusChanged(AtCore::STATES newState)
 {
     QString stateString;
     switch (newState) {
     case AtCore::CONNECTING: {
         stateString = i18n("Connecting...");
         connect(&core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
         connect(core.serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
     } break;
     case AtCore::IDLE: {
         stateString = i18n("Connected to ") + core.serial()->portName();
         ui->controlDockWidget->setEnabled(true);
         ui->axisDockWidget->setEnabled(true);
         emit extruderCountChanged(core.extruderCount());
         logWidget->addLog(i18n("Serial connected"));
         _connect->setText(i18n("&Disconnect"));
     } break;
     case AtCore::DISCONNECTED: {
         stateString = i18n("Not Connected");
         ui->controlDockWidget->setEnabled(false);
         ui->axisDockWidget->setEnabled(false);
         disconnect(&core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
         disconnect(core.serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
         logWidget->addLog(i18n("Serial disconnected"));
 
     } break;
     case AtCore::STARTPRINT: {
         stateString = i18n("Starting Print");
         ui->printProgressDockWidget->setVisible(true);
         connect(&core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
     } break;
     case AtCore::FINISHEDPRINT: {
         stateString = i18n("Finished Print");
         ui->printProgressDockWidget->setVisible(false);
         disconnect(&core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
     } break;
     case AtCore::BUSY: {
         stateString = i18n("Printing");
     } break;
     case AtCore::PAUSE: {
         stateString = i18n("Paused");
     } break;
     case AtCore::STOP: {
         stateString = i18n("Stoping Print");
     } break;
     case AtCore::ERRORSTATE: {
         stateString = i18n("Error");
     } break;
     }
     ui->lblState->setText(stateString);
 }
 
 void MainWindow::checkTemperature(uint sensorType, uint number, uint temp)
 {
     QString msg;
     switch (sensorType) {
     case 0x00: // bed
         msg = QString::fromLatin1("Bed Temperature ");
         break;
 
     case 0x01: // bed target
         msg = QString::fromLatin1("Bed Target Temperature ");
         break;
 
     case 0x02: // extruder
         msg = QString::fromLatin1("Extruder Temperature ");
         break;
 
     case 0x03: // extruder target
         msg = QString::fromLatin1("Extruder Target Temperature ");
         break;
 
     case 0x04: // enclosure
         msg = QString::fromLatin1("Enclosure Temperature ");
         break;
 
     case 0x05: // enclosure target
         msg = QString::fromLatin1("Enclosure Target Temperature ");
         break;
     }
 
     msg.append(QString::fromLatin1("[%1] : %2"));
     msg = msg.arg(QString::number(number))
           .arg(QString::number(temp));
 
     logWidget->addRLog(msg);
 }
 
 void MainWindow::checkReceivedCommand(const QByteArray &message)
 {
     logWidget->addRLog(QString::fromUtf8(message));
 }
 
 void MainWindow::checkPushedCommands(QByteArray bmsg)
 {
     QString msg = QString::fromUtf8(bmsg);
     QRegExp _newLine(QChar::fromLatin1('\n'));
     QRegExp _return(QChar::fromLatin1('\r'));
     msg.replace(_newLine, QStringLiteral("\\n"));
     msg.replace(_return, QStringLiteral("\\r"));
     logWidget->addSLog(msg);
 }
 
 void MainWindow::axisControlClicked(QChar axis, int value)
 {
     core.setRelativePosition();
     core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value))));
     core.setAbsolutePosition();
 }
 
 void MainWindow::toggleDockTitles(bool checked)
 {
     if(checked){
         delete ui->axisDockWidget->titleBarWidget();
         delete ui->view3DdockWidget->titleBarWidget();
         delete ui->plotDockWidget->titleBarWidget();
         delete ui->logDockWidget->titleBarWidget();
         delete ui->controlDockWidget->titleBarWidget();
         delete ui->gcodeDockWidget->titleBarWidget();
     }else{
         ui->axisDockWidget->setTitleBarWidget(new QWidget());
         ui->view3DdockWidget->setTitleBarWidget(new QWidget());
         ui->plotDockWidget->setTitleBarWidget(new QWidget());
         ui->logDockWidget->setTitleBarWidget(new QWidget());
         ui->controlDockWidget->setTitleBarWidget(new QWidget());
         ui->gcodeDockWidget->setTitleBarWidget(new QWidget());
     }
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9faf3f0..a5760fe 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,64 +1,62 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
 #include <QMainWindow>
 #include <QUrl>
 #include <AtCore/AtCore>
 #include <KXmlGui/KXmlGuiWindow>
-#include <dialogs/profilesdialog.h>
 #include <widgets/logwidget.h>
 namespace Ui
 {
 class MainWindow;
 }
 
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private:
     Ui::MainWindow *ui;
     AtCore core;
     QStringList firmwaresList;
     QUrl fileName;
-    ProfilesDialog *profilesDialog;
     LogWidget *logWidget;
     QAction *_connect;
     void initConnectsToAtCore();
     void initWidgets();
     void setupActions();
     void openFile();
     void printFile();
     void pausePrint();
     void stopPrint();
     void checkReceivedCommand(const QByteArray &message);
     void checkPushedCommands(QByteArray bmsg);
     void handlePrinterStatusChanged(AtCore::STATES newState);
     void checkTemperature(uint sensorType, uint number, uint temp);
     void axisControlClicked(QChar axis, int value);
     void toggleDockTitles(bool checked);
 
 signals:
     void extruderCountChanged(int count);
 
 };