diff --git a/src/dialogs/connectsettingsdialog.cpp b/src/dialogs/connectsettingsdialog.cpp
index 1abe4fd..ecf8165 100644
--- a/src/dialogs/connectsettingsdialog.cpp
+++ b/src/dialogs/connectsettingsdialog.cpp
@@ -1,117 +1,118 @@
 /* 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 "connectsettingsdialog.h"
 #include "ui_connectsettingsdialog.h"
 #include <QSerialPortInfo>
 #include <QMessageBox>
 #include <KLocalizedString>
 #include <QCloseEvent>
 
 ConnectSettingsDialog::ConnectSettingsDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ConnectSettingsDialog),
     deviceNotifier(Solid::DeviceNotifier::instance())
 {
     ui->setupUi(this);
     connect(deviceNotifier, &Solid::DeviceNotifier::deviceAdded, this, &ConnectSettingsDialog::locateSerialPort);
     connect(deviceNotifier, &Solid::DeviceNotifier::deviceRemoved, this, &ConnectSettingsDialog::locateSerialPort);
     locateSerialPort();
 
     connect(ui->buttonBox, &QDialogButtonBox::clicked, [ = ](QAbstractButton * btn) {
         if (ui->buttonBox->buttonRole(btn) == QDialogButtonBox::RejectRole) {
             close();
         }
     });
 
     updateProfiles();
 }
 
 ConnectSettingsDialog::~ConnectSettingsDialog()
 {
     delete ui;
 }
 
 void ConnectSettingsDialog::locateSerialPort()
 {
     QStringList ports;
     QList<QSerialPortInfo> serialPortInfoList = QSerialPortInfo::availablePorts();
     if (!serialPortInfoList.isEmpty()) {
         foreach (const QSerialPortInfo &serialPortInfo, serialPortInfoList) {
 #ifdef Q_OS_MAC
             //Mac os has callout serial ports starting with cu. they can only recv data. filter them out
             if (!serialPortInfo.portName().startsWith(QStringLiteral("cu."), Qt::CaseInsensitive)) {
                 ports.append(serialPortInfo.portName());
             }
 #else
             ports.append(serialPortInfo.portName());
 #endif
         }
         if (ports == serialPortList) {
             return;
         } else {
             serialPortList.clear();
             serialPortList = ports;
             ui->serialPortCB->clear();
             ui->serialPortCB->addItems(serialPortList);
         }
     } else {
         serialPortList.clear();
         ui->serialPortCB->clear();
     }
 }
 
 void ConnectSettingsDialog::updateProfiles()
 {
     settings.beginGroup("GeneralSettings");
     QStringList groups = settings.childGroups();
     settings.endGroup();
     ui->profileCB->clear();
     ui->profileCB->addItems(groups);
 }
 
 void ConnectSettingsDialog::setFirmwareList(QStringList fw)
 {
-    fw.prepend(i18n("Auto-Detect"));
+    fw.prepend("Auto-Detect");
     ui->firmwareCB->clear();
     ui->firmwareCB->addItems(fw);
 }
 
 QMap<QString, QVariant> ConnectSettingsDialog::profileData()
 {
     settings.beginGroup("GeneralSettings");
     settings.beginGroup(ui->profileCB->currentText());
     QMap<QString, QVariant> data;
     data["bps"] = settings.value(QStringLiteral("bps"), QStringLiteral("115200"));
     data["bedTemp"] = settings.value(QStringLiteral("temperatureBed"), QStringLiteral("0"));
     data["hotendTemp"] = settings.value(QStringLiteral("temperatureExtrude"), QStringLiteral("0"));
+    data["firmware"] = ui->firmwareCB->currentText();
     settings.endGroup();
     settings.endGroup();
     return data;
 }
 
 void ConnectSettingsDialog::accept()
 {
     if (ui->profileCB->currentText().isEmpty()) {
         QMessageBox::warning(this, i18n("Warning"), i18n("Please, create a profile to connect on Settings!"));
     } else if (ui->serialPortCB->currentText().isEmpty()) {
         QMessageBox::warning(this, i18n("Warning"), i18n("Please, connect a serial device to continue!"));
     } else {
         emit startConnection(ui->serialPortCB->currentText(), profileData());
         this->close();
     }
 }
diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp
index 3ce9b4b..f4285b5 100644
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -1,320 +1,328 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2017>
     Author: Lays Rodrigues - laysrodriguessilva@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 "atcoreinstancewidget.h"
 #include "ui_atcoreinstancewidget.h"
 #include <QToolBar>
 #include <AtCore/SerialLayer>
 #include <AtCore/GCodeCommands>
 #include <KLocalizedString>
 #include "../dialogs/choosefiledialog.h"
 
 AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent):
     QWidget(parent),
     m_connected(false)
 {
     ui = new Ui::AtCoreInstanceWidget;
     ui->setupUi(this);
     ui->printPB->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
     ui->pausePB->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
     ui->stopPB->setIcon(style()->standardIcon(QStyle::SP_MediaStop));
     ui->disableMotorsPB->setIcon(style()->standardIcon(QStyle::SP_DockWidgetCloseButton));
     ui->printProgressWidget->setVisible(false);
     
     setupConnections();
     initConnectsToAtCore();
     enableControls(false);
 }
 
 AtCoreInstanceWidget::~AtCoreInstanceWidget()
 {
     delete ui;
 }
 
 void AtCoreInstanceWidget::setupConnections(){
     connect(ui->pausePB, &QPushButton::clicked, this, &AtCoreInstanceWidget::pausePrint);
     connect(ui->stopPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::stopPrint);
     connect(ui->disableMotorsPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::disableMotors);
 
     buildToolbar();
     connect(ui->disconnectPB, &QPushButton::clicked, [=]{
         m_core.setState(AtCore::DISCONNECTED);
     });
     connect(ui->printPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::print);
 }
 
 void AtCoreInstanceWidget::buildToolbar()
 {
     toolBar = new QToolBar();
     //toolBar->setOrientation(Qt::Vertical);
     
     auto *axis = new QAction("Axis");
     axis->setCheckable(true);
     axis->setChecked(true);
     connect(axis, &QAction::toggled, ui->axisViewWidget, &AxisControl::setVisible);
     
     auto *controls = new QAction("Controls");
     controls->setCheckable(true);
     controls->setChecked(true);
     connect(controls, &QAction::toggled, ui->bedExtWidget, &BedExtruderWidget::setVisible);
     
     auto *plot = new QAction("Temperature Plot");
     plot->setCheckable(true);
     plot->setChecked(true);
     connect(plot, &QAction::toggled, ui->plotWidget, &PlotWidget::setVisible);
     
     toolBar->addAction(axis);
     toolBar->addAction(controls);
     toolBar->addAction(plot);
     ui->toolBarLayout->addWidget(new QLabel(i18n("Show/Hide: ")));
     ui->toolBarLayout->addWidget(toolBar);
     ui->toolBarLayout->addStretch();
 }
 
 void AtCoreInstanceWidget::startConnection(QString serialPort, QMap<QString, QVariant> profiles){
     m_core.initSerial(serialPort, profiles["bps"].toInt());
+    if(m_core.state() == AtCore::CONNECTING){
+        QString fw = profiles["firmware"].toString();
+        if( fw == QString("Auto-Detect")){
+            m_core.detectFirmware();
+        }else{
+            m_core.loadFirmwarePlugin(fw);
+        }
+    }
 }
 
 void AtCoreInstanceWidget::initConnectsToAtCore()
 {
 
     // Handle AtCore status change
     connect(&m_core, &AtCore::stateChanged, this, &AtCoreInstanceWidget::handlePrinterStatusChanged);
 
     // If the number of extruders from the printer change, we need to update the radiobuttons on the widget
     connect(this, &AtCoreInstanceWidget::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount);
 
     // Bed and Extruder temperatures management
     connect(ui->bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, &AtCore::setBedTemp);
     connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, &AtCore::setExtruderTemp);
 
     // Connect AtCore temperatures changes on Atelier Plot
     connect(&m_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(&m_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(&m_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(&m_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) {
         ui->logWidget->addLog("Push " + command);
         m_core.pushCommand(command);
     });
 
     // Fan, Flow and Speed management
     connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed);
     connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &m_core, &AtCore::setFlowRate);
     connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed);
     connect(ui->axisViewWidget, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked);
 
 }
 
 void AtCoreInstanceWidget::printFile(const QString& fileName)
 {
     if (!fileName.isEmpty() && (m_core.state() == AtCore::IDLE)) {
         m_core.print(fileName);
     }
 }
 
 void AtCoreInstanceWidget::print(){
     auto dialog = new ChooseFileDialog(this, m_files);
     if(dialog->exec() == QDialog::Accepted){
         printFile(dialog->choosenFile());
     }
 }
 void AtCoreInstanceWidget::pausePrint()
 {
     m_core.pause(QString());
 }
 
 void AtCoreInstanceWidget::stopPrint()
 {
     m_core.stop();
 }
 
 void AtCoreInstanceWidget::disableMotors()
 {
     m_core.pushCommand(GCode::toCommand(GCode::M18));
 }
 
 void AtCoreInstanceWidget::handlePrinterStatusChanged(AtCore::STATES newState)
 {
     QString stateString;
     switch (newState) {
         case AtCore::CONNECTING: {
             stateString = i18n("Connecting...");
             connect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             connect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
         } break;
         case AtCore::IDLE: {
             stateString = i18n("Connected to ") + m_core.serial()->portName();
             emit extruderCountChanged(m_core.extruderCount());
             ui->logWidget->addLog(i18n("Serial connected"));
             ui->disconnectPB->setEnabled(true);
             setConnectedStatus(true);
         } break;
         case AtCore::DISCONNECTED: {
             stateString = i18n("Not Connected");
             disconnect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             disconnect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
             ui->logWidget->addLog(i18n("Serial disconnected"));
             setConnectedStatus(false);
         } break;
         case AtCore::STARTPRINT: {
             stateString = i18n("Starting Print");
             ui->printProgressWidget->setVisible(true);
             connect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
         } break;
         case AtCore::FINISHEDPRINT: {
             stateString = i18n("Finished Print");
             ui->printProgressWidget->setVisible(false);
             disconnect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
         } break;
         case AtCore::BUSY: {
             stateString = i18n("Printing");
             ui->disconnectPB->setDisabled(true);
         } 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 AtCoreInstanceWidget::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));
 
     ui->logWidget->addRLog(msg);
 }
 
 void AtCoreInstanceWidget::checkReceivedCommand(const QByteArray &message)
 {
     ui->logWidget->addRLog(QString::fromUtf8(message));
 }
 
 void AtCoreInstanceWidget::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"));
     ui->logWidget->addSLog(msg);
 }
 
 void AtCoreInstanceWidget::axisControlClicked(QChar axis, int value)
 {
     m_core.setRelativePosition();
     m_core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value))));
     m_core.setAbsolutePosition();
 }
 
 void AtCoreInstanceWidget::enableControls(bool b)
 {
     ui->mainTab->setEnabled(b);
     ui->printPB->setEnabled(b);
     ui->pausePB->setEnabled(b);
     ui->stopPB->setEnabled(b);
     ui->disconnectPB->setEnabled(b);
     ui->disableMotorsPB->setEnabled(b);
     toolBar->setEnabled(b);
     
 }
 
 bool AtCoreInstanceWidget::connected()
 {
     return m_connected;
 }
 
 void AtCoreInstanceWidget::setConnectedStatus(bool b)
 {
     m_connected = b;
     enableControls(b);
 }
 
 void AtCoreInstanceWidget::setOpenFiles(QList<QUrl> files)
 {
     m_files = files;
 }
 
 const QStringList AtCoreInstanceWidget::baudRates()
 {
     return m_core.portSpeeds();
 }
 
 const QStringList AtCoreInstanceWidget::firmwares()
 {
     return m_core.availableFirmwarePlugins();
 }