diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp
index 3b960a3..a616faf 100644
--- a/sources/dataengine/netctl.cpp
+++ b/sources/dataengine/netctl.cpp
@@ -75,12 +75,11 @@ void Netctl::readConfiguration()
         fileStr = QString(confFile.readLine()).trimmed();
         if (fileStr[0] == QChar('#')) continue;
         if (fileStr[0] == QChar(';')) continue;
-        if (fileStr.contains(QChar('='))) {
-            value.clear();
-            for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
-                value.append(fileStr.split(QChar('='))[i]);
-            rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
-        }
+        if (!fileStr.contains(QChar('='))) continue;
+        value.clear();
+        for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
+            value.append(fileStr.split(QChar('='))[i]);
+        rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
         if (confFile.atEnd())
             break;
     }
diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp
index 7af5a1a..4e80b88 100644
--- a/sources/gui/src/bridgewidget.cpp
+++ b/sources/gui/src/bridgewidget.cpp
@@ -76,6 +76,7 @@ void BridgeWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> bridgeSettings = settings;
 
     if (bridgeSettings.contains(QString("SkipForwardingDelay")))
-        if (bridgeSettings[QString("SkipForwardingDelay")].remove(QString("'")) == QString("yes"))
+        if (bridgeSettings[QString("SkipForwardingDelay")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_skip->setCheckState(Qt::Checked);
 }
diff --git a/sources/gui/src/errorwindow.cpp b/sources/gui/src/errorwindow.cpp
index 66d6332..a5ce3b3 100644
--- a/sources/gui/src/errorwindow.cpp
+++ b/sources/gui/src/errorwindow.cpp
@@ -42,6 +42,7 @@ ErrorWindow::~ErrorWindow()
 void ErrorWindow::setMessage(const int mess)
 {
     if (debug) qDebug() << "[ErrorWindow]" << "[setMessage]";
+    if (debug) qDebug() << "[ErrorWindow]" << "[setMessage]" << ":" << "Message" << mess;
 
     QString message;
     switch(mess) {
diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp
index 609b9fe..de8ea79 100644
--- a/sources/gui/src/ethernetwidget.cpp
+++ b/sources/gui/src/ethernetwidget.cpp
@@ -145,16 +145,20 @@ void EthernetWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> ethernetSettings = settings;
 
     if (ethernetSettings.contains(QString("SkipNoCarrier")))
-        if (ethernetSettings[QString("SkipNoCarrier")].remove(QString("'")) == QString("yes"))
+        if (ethernetSettings[QString("SkipNoCarrier")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_skip->setCheckState(Qt::Checked);
     if (ethernetSettings.contains(QString("Auth8021X")))
-        if (ethernetSettings[QString("Auth8021X")].remove(QString("'")) == QString("yes"))
+        if (ethernetSettings[QString("Auth8021X")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_8021x->setCheckState(Qt::Checked);
     if (ethernetSettings.contains(QString("WPAConfigFile")))
-        ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")].remove(QString("'")));
+        ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ethernetSettings.contains(QString("WPADriver")))
         for (int i=0; i<ui->comboBox_driver->count(); i++)
-            if (ethernetSettings[QString("WPADriver")].remove(QString("'")) == ui->comboBox_driver->itemText(i))
+            if (ethernetSettings[QString("WPADriver")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_driver->itemText(i))
                 ui->comboBox_driver->setCurrentIndex(i);
     if (ethernetSettings.contains(QString("TimeoutCarrier")))
         ui->spinBox_timeoutCarrier->setValue(ethernetSettings[QString("TimeoutCarrier")].toInt());
diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp
index 844f0cb..8df2933 100644
--- a/sources/gui/src/generalwidget.cpp
+++ b/sources/gui/src/generalwidget.cpp
@@ -136,13 +136,13 @@ QMap<QString, QString> GeneralWidget::getSettings()
         QStringList interfaces;
         for (int i=0; i<ui->listWidget_bindto->count(); i++)
             interfaces.append(ui->listWidget_bindto->item(i)->text());
-        generalSettings[QString("BindsToInterfaces")] = interfaces.join(QString(" "));
+        generalSettings[QString("BindsToInterfaces")] = interfaces.join(QChar(' '));
     }
     if (ui->listWidget_after->count() != 0) {
         QStringList profiles;
         for (int i=0; i<ui->listWidget_after->count(); i++)
             profiles.append(ui->listWidget_after->item(i)->text());
-        generalSettings[QString("After")] = profiles.join(QString(" "));
+        generalSettings[QString("After")] = profiles.join(QChar(' '));
     }
     if (!ui->lineEdit_execUpPost->text().isEmpty())
         generalSettings[QString("ExecUpPost")] = QString("'") + ui->lineEdit_execUpPost->text() + QString("'");
@@ -179,27 +179,34 @@ void GeneralWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> generalSettings = settings;
 
     if (generalSettings.contains(QString("Description")))
-        ui->lineEdit_description->setText(generalSettings[QString("Description")].remove(QString("'")));
+        ui->lineEdit_description->setText(generalSettings[QString("Description")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("Connection")))
         for (int i=0; i<ui->comboBox_connection->count(); i++)
-            if (generalSettings[QString("Connection")].remove(QString("'")) == ui->comboBox_connection->itemText(i))
+            if (generalSettings[QString("Connection")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i))
                 ui->comboBox_connection->setCurrentIndex(i);
     if (generalSettings.contains(QString("Interface")))
         for (int i=0; i<ui->comboBox_interface->count(); i++)
-            if (generalSettings[QString("Interface")].remove(QString("'")) == ui->comboBox_interface->itemText(i))
+            if (generalSettings[QString("Interface")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_interface->itemText(i))
                 ui->comboBox_interface->setCurrentIndex(i);
     if (generalSettings.contains(QString("BindsToInterfaces")))
         ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar(' ')));
     if (generalSettings.contains(QString("After")))
         ui->listWidget_after->addItems(generalSettings[QString("After")].split(QChar(' ')));
     if (generalSettings.contains(QString("ExecUpPost")))
-        ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")].remove(QString("'")));
+        ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("ExecDownPre")))
-        ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")].remove(QString("'")));
+        ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("ForceConnect")))
-        if (generalSettings[QString("ForceConnect")].remove(QString("'")) == QString("yes"))
+        if (generalSettings[QString("ForceConnect")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_forceConnect->setCheckState(Qt::Checked);
     if (generalSettings.contains(QString("NETCTL_DEBUG")))
-        if (generalSettings[QString("NETCTL_DEBUG")].remove(QString("'")) == QString("yes"))
+        if (generalSettings[QString("NETCTL_DEBUG")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_debug->setCheckState(Qt::Checked);
 }
diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp
index cd0c9aa..6ff3a8a 100644
--- a/sources/gui/src/ipwidget.cpp
+++ b/sources/gui/src/ipwidget.cpp
@@ -186,7 +186,7 @@ QString IpWidget::getIp(const QString rawIp)
         if (ip[i].toInt() > 255)
             ip[i] = QString("255");
 
-    return ip.join(QString("."));
+    return ip.join(QChar('.'));
 }
 
 
@@ -233,8 +233,8 @@ QString IpWidget::getPrefix6(const QString rawPrefix)
 
 void IpWidget::addIp()
 {
-    QString ip = getIp(ui->lineEdit_ipAddress->text().remove(" ").split(QChar('/'))[0]);
-    QString prefix = getPrefix(ui->lineEdit_ipAddress->text().remove(" ").split(QChar('/'))[1]);
+    QString ip = getIp(ui->lineEdit_ipAddress->text().remove(QChar(' ')).split(QChar('/'))[0]);
+    QString prefix = getPrefix(ui->lineEdit_ipAddress->text().remove(QChar(' ')).split(QChar('/'))[1]);
 
     ui->listWidget_ipAddress->addItem(ip + QString("/") + prefix);
     ui->lineEdit_ipAddress->clear();
@@ -243,9 +243,9 @@ void IpWidget::addIp()
 
 void IpWidget::addIpRoutes()
 {
-    QString ip = getIp(ui->lineEdit_ipRoutes->text().remove(" ").split(QChar('/'))[0]);
-    QString prefix = getPrefix(ui->lineEdit_ipRoutes->text().remove(" ").split(QChar('/'))[1]);
-    QString ipVia = getIp(ui->lineEdit_ipRoutes2->text().remove(" "));
+    QString ip = getIp(ui->lineEdit_ipRoutes->text().remove(QChar(' ')).split(QChar('/'))[0]);
+    QString prefix = getPrefix(ui->lineEdit_ipRoutes->text().remove(QChar(' ')).split(QChar('/'))[1]);
+    QString ipVia = getIp(ui->lineEdit_ipRoutes2->text().remove(QChar(' ')));
 
     ui->listWidget_ipRoutes->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia);
     ui->lineEdit_ipRoutes->clear();
@@ -255,8 +255,8 @@ void IpWidget::addIpRoutes()
 
 void IpWidget::addIp6()
 {
-    QString ip = getIp6(ui->lineEdit_ipAddress6->text().remove(" ").split(QChar('/'))[0]);
-    QString prefix = getPrefix6(ui->lineEdit_ipAddress6->text().remove(" ").split(QChar('/'))[1]);
+    QString ip = getIp6(ui->lineEdit_ipAddress6->text().remove(QChar(' ')).split(QChar('/'))[0]);
+    QString prefix = getPrefix6(ui->lineEdit_ipAddress6->text().remove(QChar(' ')).split(QChar('/'))[1]);
 
     ui->listWidget_ipAddress6->addItem(ip + QString("/") + prefix);
     ui->lineEdit_ipAddress6->clear();
@@ -265,9 +265,9 @@ void IpWidget::addIp6()
 
 void IpWidget::addIpRoutes6()
 {
-    QString ip = getIp6(ui->lineEdit_ipRoutes6->text().remove(" ").split(QChar('/'))[0]);
-    QString prefix = getPrefix6(ui->lineEdit_ipRoutes6->text().remove(" ").split(QChar('/'))[1]);
-    QString ipVia = getIp6(ui->lineEdit_ipRoutes62->text().remove(" "));
+    QString ip = getIp6(ui->lineEdit_ipRoutes6->text().remove(QChar(' ')).split(QChar('/'))[0]);
+    QString prefix = getPrefix6(ui->lineEdit_ipRoutes6->text().remove(QChar(' ')).split(QChar('/'))[1]);
+    QString ipVia = getIp6(ui->lineEdit_ipRoutes62->text().remove(QChar(' ')));
 
     ui->listWidget_ipRoutes6->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia);
     ui->lineEdit_ipRoutes6->clear();
@@ -285,7 +285,7 @@ void IpWidget::addCustom()
 
 void IpWidget::addDns()
 {
-    QString ip = getIp(ui->lineEdit_dns->text().remove(" "));
+    QString ip = getIp(ui->lineEdit_dns->text().remove(QChar(' ')));
 
     ui->listWidget_dns->addItem(ip);
     ui->lineEdit_dns->clear();
@@ -389,14 +389,14 @@ QMap<QString, QString> IpWidget::getSettings()
             QStringList addresses;
             for (int i=0; i<ui->listWidget_ipAddress->count(); i++)
                 addresses.append(QString("'") + ui->listWidget_ipAddress->item(i)->text() + QString("'"));
-            ipSettings[QString("Address")] = addresses.join(QString(" "));
+            ipSettings[QString("Address")] = addresses.join(QChar(' '));
             ipSettings[QString("Gateway")] = QString("'") + ui->lineEdit_gateway->text() + QString("'");
         }
         if (ui->listWidget_ipRoutes->count() > 0) {
             QStringList routes;
             for (int i=0; i<ui->listWidget_ipRoutes->count(); i++)
                 routes.append(QString("'") + ui->listWidget_ipRoutes->item(i)->text() + QString("'"));
-            ipSettings[QString("Routes")] = routes.join(QString(" "));
+            ipSettings[QString("Routes")] = routes.join(QChar(' '));
         }
     }
     else
@@ -408,14 +408,14 @@ QMap<QString, QString> IpWidget::getSettings()
             QStringList addresses;
             for (int i=0; i<ui->listWidget_ipAddress6->count(); i++)
                 addresses.append(QString("'") + ui->listWidget_ipAddress6->item(i)->text() + QString("'"));
-            ipSettings[QString("Address6")] = addresses.join(QString(" "));
+            ipSettings[QString("Address6")] = addresses.join(QChar(' '));
             ipSettings[QString("Gateway6")] = QString("'") + ui->lineEdit_gateway6->text() + QString("'");
         }
         if (ui->listWidget_ipRoutes6->count() > 0) {
             QStringList routes;
             for (int i=0; i<ui->listWidget_ipRoutes6->count(); i++)
                 routes.append(QString("'") + ui->listWidget_ipRoutes6->item(i)->text() + QString("'"));
-            ipSettings[QString("Routes6")] = routes.join(QString(" "));
+            ipSettings[QString("Routes6")] = routes.join(QChar(' '));
         }
     }
     else
@@ -424,7 +424,7 @@ QMap<QString, QString> IpWidget::getSettings()
         QStringList custom;
         for (int i=0; i<ui->listWidget_custom->count(); i++)
             custom.append(QString("'") + ui->listWidget_custom->item(i)->text() + QString("'"));
-        ipSettings[QString("IPCustom")] = custom.join(QString(" "));
+        ipSettings[QString("IPCustom")] = custom.join(QChar(' '));
     }
     if (!ui->lineEdit_hostname->text().isEmpty())
         ipSettings[QString("Hostname")] = QString("'") + ui->lineEdit_hostname->text() + QString("'");
@@ -449,7 +449,7 @@ QMap<QString, QString> IpWidget::getSettings()
         QStringList dns;
         for (int i=0; i<ui->listWidget_dns->count(); i++)
             dns.append(QString("'") + ui->listWidget_dns->item(i)->text() + QString("'"));
-        ipSettings[QString("DNS")] = dns.join(QString(" "));
+        ipSettings[QString("DNS")] = dns.join(QChar(' '));
     }
     if (!ui->lineEdit_dnsDomain->text().isEmpty())
         ipSettings[QString("DNSDomain")] = QString("'") + ui->lineEdit_dnsDomain->text() + QString("'");
@@ -459,7 +459,7 @@ QMap<QString, QString> IpWidget::getSettings()
         QStringList dnsOpt;
         for (int i=0; i<ui->listWidget_dnsOptions->count(); i++)
             dnsOpt.append(QString("'") + ui->listWidget_dnsOptions->item(i)->text() + QString("'"));
-        ipSettings[QString("DNSOptions")] = dnsOpt.join(QString(" "));
+        ipSettings[QString("DNSOptions")] = dnsOpt.join(QChar(' '));
     }
 
     return ipSettings;
@@ -492,37 +492,50 @@ void IpWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> ipSettings = settings;
 
     if (ipSettings.contains(QString("IP"))) {
-        if (ipSettings[QString("IP")].remove(QString("'")) == QString("no"))
+        if (ipSettings[QString("IP")].remove(QChar('\'')).remove(QChar('"')) == QString("no"))
             ui->checkBox_ip->setCheckState(Qt::Unchecked);
         else {
             ui->checkBox_ip->setCheckState(Qt::Checked);
             for (int i=0; i<ui->comboBox_ip->count(); i++)
-                if (ipSettings[QString("IP")].remove(QString("'")) == ui->comboBox_ip->itemText(i))
+                if (ipSettings[QString("IP")]
+                        .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip->itemText(i))
                     ui->comboBox_ip->setCurrentIndex(i);
         }
     }
     if (ipSettings.contains(QString("Address")))
-        ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
     if (ipSettings.contains(QString("Gateway")))
-        ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")].remove(QString("'")));
+        ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("Routes")))
-        ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
     if (ipSettings.contains(QString("IP6"))) {
-        if (ipSettings[QString("IP6")].remove(QString("'")) == QString("no"))
+        if (ipSettings[QString("IP6")].remove(QChar('\''))
+                .remove(QChar('\'')).remove(QChar('"')) == QString("no"))
             ui->checkBox_ip6->setCheckState(Qt::Unchecked);
         else {
             ui->checkBox_ip6->setCheckState(Qt::Checked);
             for (int i=0; i<ui->comboBox_ip6->count(); i++)
-                if (ipSettings[QString("IP6")].remove(QString("'")) == ui->comboBox_ip6->itemText(i))
+                if (ipSettings[QString("IP6")]
+                        .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip6->itemText(i))
                     ui->comboBox_ip6->setCurrentIndex(i);
         }
     }
     if (ipSettings.contains(QString("Address6")))
-        ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
     if (ipSettings.contains(QString("Gateway6")))
-        ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")].remove(QString("'")));
+        ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("Routes6")))
-        ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
     if (ipSettings.contains(QString("IPCustom"))) {
         QStringList custom;
         if (ipSettings[QString("IPCustom")].contains(QString("\n")))
@@ -530,35 +543,48 @@ void IpWidget::setSettings(const QMap<QString, QString> settings)
         else
             custom = ipSettings[QString("IPCustom")].split(QString("' '"));
         for (int i=0; i<custom.count(); i++)
-            ui->listWidget_custom->addItem(custom[i].remove(QString("'")));
+            ui->listWidget_custom->addItem(custom[i]
+                                           .remove(QChar('\'')).remove(QChar('"')));
     }
     if (ipSettings.contains(QString("Hostname")))
-        ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")].remove(QString("'")));
+        ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("TimeoutDAD")))
         ui->spinBox_timeoutDad->setValue(ipSettings[QString("TimeoutDAD")].toInt());
     if (ipSettings.contains(QString("DHCPClient")))
         for (int i=0; i<ui->comboBox_dhcp->count(); i++)
-            if (ipSettings[QString("DHCPClient")].remove(QString("'")) == ui->comboBox_dhcp->itemText(i))
+            if (ipSettings[QString("DHCPClient")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_dhcp->itemText(i))
                 ui->comboBox_dhcp->setCurrentIndex(i);
     if (ipSettings.contains(QString("DhcpcdOptions")))
-        ui->lineEdit_dhcpcdOpt->setText(ipSettings[QString("DhcpcdOptions")].remove(QString("'")));
+        ui->lineEdit_dhcpcdOpt->setText(ipSettings[QString("DhcpcdOptions")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DhclientOptions")))
-        ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")].remove(QString("'")));
+        ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DhclientOptions6")))
-        ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")].remove(QString("'")));
+        ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("TimeoutDHCP")))
         ui->spinBox_timeoutDhcp->setValue(ipSettings[QString("TimeoutDHCP")].toInt());
     if (ipSettings.contains(QString("DHCPReleaseOnStop")))
-        if (ipSettings[QString("DHCPReleaseOnStop")].remove(QString("'")) == QString("yes"))
+        if (ipSettings[QString("DHCPReleaseOnStop")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_dhcp->setCheckState(Qt::Checked);
     if (ipSettings.contains(QString("DNS")))
-        ui->listWidget_dns->addItems(ipSettings[QString("DNS")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_dns->addItems(ipSettings[QString("DNS")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
     if (ipSettings.contains(QString("DNSDomain")))
-        ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")].remove(QString("'")));
+        ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DNSSearch")))
-        ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")].remove(QString("'")));
+        ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DNSOptions")))
-        ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")].remove(QString("'")).split(QChar(' ')));
+        ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")]
+                .remove(QChar('\'')).remove(QChar('"'))
+                .split(QChar(' ')));
 
     ipEnable(ui->checkBox_ip->checkState());
     changeIpMode(ui->comboBox_ip->currentText());
diff --git a/sources/gui/src/language.cpp b/sources/gui/src/language.cpp
index d8698af..ccf943f 100644
--- a/sources/gui/src/language.cpp
+++ b/sources/gui/src/language.cpp
@@ -36,6 +36,7 @@ QString Language::checkLanguage(const QString language, const QString defaultLan
     for (int i=0; i<availableLanguages.count(); i++)
         if (language.contains(availableLanguages[i] + QChar('_')))
             return availableLanguages[i];
+
     return defaultLanguage;
 }
 
@@ -47,6 +48,7 @@ QString Language::defineLanguage(const QString configPath)
     if (language.isEmpty())
         language = defineLanguageFromLocale();
     language = checkLanguage(language, QString("en"));
+
     return language;
 }
 
@@ -58,19 +60,20 @@ QString Language::defineLanguageFromFile(const QString configPath)
         return language;
     QFile configFile(configPath);
     QString fileStr;
-    if (configFile.open(QIODevice::ReadOnly))
-        while (true) {
-            fileStr = QString(configFile.readLine());
-            if (fileStr[0] != '#') {
-                if (fileStr.contains(QString("LANGUAGE=")))
-                    language = fileStr.split(QChar('='))[1]
-                            .remove(QString(" "))
-                            .trimmed();
-            }
-            if (configFile.atEnd())
-                break;
-        }
+    if (!configFile.open(QIODevice::ReadOnly))
+        return language;
+    while (true) {
+        fileStr = QString(configFile.readLine());
+        if (fileStr[0] == QChar('#')) continue;
+        if (fileStr.contains(QString("LANGUAGE=")))
+            language = fileStr.split(QChar('='))[1]
+                    .remove(QChar(' '))
+                    .trimmed();
+        if (configFile.atEnd())
+            break;
+    }
     configFile.close();
+
     return language;
 }
 
@@ -86,5 +89,6 @@ QStringList Language::getAvailableLanguages()
     QStringList languages;
     languages.append(QString("en"));
     languages.append(QString("ru"));
+
     return languages;
 }
diff --git a/sources/gui/src/macvlanwidget.cpp b/sources/gui/src/macvlanwidget.cpp
index 4aadf85..5cc1fbf 100644
--- a/sources/gui/src/macvlanwidget.cpp
+++ b/sources/gui/src/macvlanwidget.cpp
@@ -66,7 +66,7 @@ QMap<QString, QString> MacvlanWidget::getSettings()
         return macvlanSettings;
 
     macvlanSettings[QString("Mode")] = ui->comboBox_mode->currentText();
-    if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty())
+    if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
         macvlanSettings[QString("MACAddress")] = ui->lineEdit_mac->text();
 
     return macvlanSettings;
@@ -87,7 +87,8 @@ void MacvlanWidget::setSettings(const QMap<QString, QString> settings)
 
     if (macvlanSettings.contains(QString("Mode")))
         for (int i=0; i<ui->comboBox_mode->count(); i++)
-            if (macvlanSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
+            if (macvlanSettings[QString("Mode")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
                 ui->comboBox_mode->setCurrentIndex(i);
     if (macvlanSettings.contains(QString("MACAddress")))
         ui->lineEdit_mac->setText(macvlanSettings[QString("MACAddress")]);
diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp
index 453f14a..312ca64 100644
--- a/sources/gui/src/mobilewidget.cpp
+++ b/sources/gui/src/mobilewidget.cpp
@@ -147,25 +147,33 @@ void MobileWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> mobileSettings = settings;
 
     if (mobileSettings.contains(QString("User")))
-        ui->lineEdit_username->setText(mobileSettings[QString("User")].remove(QString("'")));
+        ui->lineEdit_username->setText(mobileSettings[QString("User")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (mobileSettings.contains(QString("Password")))
-        ui->lineEdit_password->setText(mobileSettings[QString("Password")].remove(QString("'")));
+        ui->lineEdit_password->setText(mobileSettings[QString("Password")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (mobileSettings.contains(QString("AccessPointName")))
-        ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")].remove(QString("'")));
+        ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (mobileSettings.contains(QString("PIN")))
-        ui->lineEdit_pin->setText(mobileSettings[QString("PIN")].remove(QString("'")));
+        ui->lineEdit_pin->setText(mobileSettings[QString("PIN")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (mobileSettings.contains(QString("Mode")))
         for (int i=0; i<ui->comboBox_mode->count(); i++)
-            if (mobileSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
+            if (mobileSettings[QString("Mode")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
                 ui->comboBox_mode->setCurrentIndex(i);
     if (mobileSettings.contains(QString("MaxFail")))
         ui->spinBox_fail->setValue(mobileSettings[QString("MaxFail")].toInt());
     if (mobileSettings.contains(QString("DefaultRoute")))
-        if (mobileSettings[QString("DefaultRoute")].remove(QString("'")) == QString("false"))
+        if (mobileSettings[QString("DefaultRoute")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("false"))
             ui->checkBox_route->setCheckState(Qt::Unchecked);
     if (mobileSettings.contains(QString("UsePeerDNS")))
-        if (mobileSettings[QString("UsePeerDNS")].remove(QString("'")) == QString("false"))
+        if (mobileSettings[QString("UsePeerDNS")]
+                .remove(QChar('\'')).remove(QChar('"'))== QString("false"))
             ui->checkBox_dns->setCheckState(Qt::Unchecked);
     if (mobileSettings.contains(QString("OptionsFile")))
-        ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")].remove(QString("'")));
+        ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")]
+                .remove(QChar('\'')).remove(QChar('"')));
 }
diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp
index 250ac17..974ba6c 100644
--- a/sources/gui/src/pppoewidget.cpp
+++ b/sources/gui/src/pppoewidget.cpp
@@ -157,9 +157,10 @@ QMap<QString, QString> PppoeWidget::getSettings()
         pppoeSettings[QString("PPPoEService")] = QString("'") + ui->lineEdit_service->text() + QString("'");
     if (!ui->lineEdit_ac->text().isEmpty())
         pppoeSettings[QString("PPPoEAC")] = QString("'") + ui->lineEdit_ac->text() + QString("'");
-    if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty())
-        pppoeSettings[QString("PPPoESession")] = QString("'") + ui->lineEdit_session->text().remove(QString(" ")) + QString("'");
-    if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty())
+    if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
+        pppoeSettings[QString("PPPoESession")] = QString("'") + ui->lineEdit_session->text()
+                .remove(QChar('\'')).remove(QChar('"')) + QString("'");
+    if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
         pppoeSettings[QString("PPPoEMAC")] = QString("'") + ui->lineEdit_mac->text() + QString("'");
     if (ui->checkBox_ipv6->checkState() == Qt::Checked)
         pppoeSettings[QString("PPPoEIP6")] = QString("yes");
@@ -175,18 +176,18 @@ int PppoeWidget::isOk()
         if (!QFile(ui->lineEdit_options->text()).exists())
             return 1;
     // mac address
-    if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty())
-        if (ui->lineEdit_mac->text().contains(QString(" ")))
+    if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
+        if (ui->lineEdit_mac->text().contains(QChar(' ')))
             return 2;
     // session id is not set
-    if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty())
-        if (ui->lineEdit_session->text().split(QChar(':'))[0].remove(QString(" ")).isEmpty())
+    if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
+        if (ui->lineEdit_session->text().split(QChar(':'))[0].remove(QChar(' ')).isEmpty())
             return 3;
     // session mac address
-    if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) {
+    if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty()) {
         QStringList item = ui->lineEdit_session->text().split(QChar(':'));
         for (int i=1; i<7; i++)
-            if (item[i].contains(QString(" ")))
+            if (item[i].contains(QChar(' ')))
                 return 4;
     }
     // all fine
@@ -200,22 +201,27 @@ void PppoeWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> pppoeSettings = settings;
 
     if (pppoeSettings.contains(QString("User")))
-        ui->lineEdit_username->setText(pppoeSettings[QString("User")].remove(QString("'")));
+        ui->lineEdit_username->setText(pppoeSettings[QString("User")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("Password")))
-        ui->lineEdit_password->setText(pppoeSettings[QString("Password")].remove(QString("'")));
+        ui->lineEdit_password->setText(pppoeSettings[QString("Password")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("ConnectionMode")))
         for (int i=0; i<ui->comboBox_connection->count(); i++)
-            if (pppoeSettings[QString("ConnectionMode")].remove(QString("'")) == ui->comboBox_connection->itemText(i))
+            if (pppoeSettings[QString("ConnectionMode")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i))
                 ui->comboBox_connection->setCurrentIndex(i);
     if (pppoeSettings.contains(QString("IdleTimeout")))
         ui->spinBox_timeout->setValue(pppoeSettings[QString("IdleTimeout")].toInt());
     if (pppoeSettings.contains(QString("MaxFail")))
         ui->spinBox_fail->setValue(pppoeSettings[QString("MaxFail")].toInt());
     if (pppoeSettings.contains(QString("DefaultRoute")))
-        if (pppoeSettings[QString("DefaultRoute")].remove(QString("'")) == QString("false"))
+        if (pppoeSettings[QString("DefaultRoute")]
+                .remove(QChar('\'')).remove(QChar('"'))== QString("false"))
             ui->checkBox_route->setCheckState(Qt::Unchecked);
     if (pppoeSettings.contains(QString("UsePeerDNS")))
-        if (pppoeSettings[QString("UsePeerDNS")].remove(QString("'")) == QString("false"))
+        if (pppoeSettings[QString("UsePeerDNS")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("false"))
             ui->checkBox_dns->setCheckState(Qt::Unchecked);
     if (pppoeSettings.contains(QString("PPPUnit")))
         ui->lineEdit_unit->setText(pppoeSettings[QString("PPPUnit")]);
@@ -224,15 +230,20 @@ void PppoeWidget::setSettings(const QMap<QString, QString> settings)
     if (pppoeSettings.contains(QString("LCPEchoFailure")))
         ui->spinBox_lcpFailure->setValue(pppoeSettings[QString("LCPEchoFailure")].toInt());
     if (pppoeSettings.contains(QString("OptionsFile")))
-        ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")].remove(QString("'")));
+        ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEService")))
-        ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")].remove(QString("'")));
+        ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEAC")))
-        ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")].remove(QString("'")));
+        ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoESession")))
-        ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")].remove(QString("'")));
+        ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEMAC")))
-        ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")].remove(QString("'")));
+        ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEIP6")))
         if (pppoeSettings[QString("PPPoEIP6")] == QString("yes"))
             ui->checkBox_dns->setCheckState(Qt::Checked);
diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp
index 39b885d..97d8966 100644
--- a/sources/gui/src/settingswindow.cpp
+++ b/sources/gui/src/settingswindow.cpp
@@ -52,12 +52,13 @@ void SettingsWindow::createActions()
 {
     if (debug) qDebug() << "[SettingsWindow]" << "[createActions]";
 
-    connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
-    connect(ui->comboBox_language, SIGNAL(currentIndexChanged(int)), ui->label_info, SLOT(show()));
     connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close()));
     connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(setDefault()));
     connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(saveSettings()));
     connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(close()));
+    connect(ui->comboBox_language, SIGNAL(currentIndexChanged(int)), ui->label_info, SLOT(show()));
+    connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
+            this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
     // buttons
     connect(ui->pushButton_interfaceDir, SIGNAL(clicked(bool)), SLOT(selectIfaceDir()));
     connect(ui->pushButton_netctlPath, SIGNAL(clicked(bool)), SLOT(selectNetctlPath()));
@@ -110,12 +111,11 @@ void SettingsWindow::saveSettings()
 
     QMap<QString, QString> settings = readSettings();
     QFile configFile(file);
-
     if (!configFile.open(QIODevice::WriteOnly | QIODevice::Text))
         return;
     QTextStream out(&configFile);
     for (int i=0; i<settings.keys().count(); i++)
-        out << settings.keys()[i] << QString("=") << settings[settings.keys()[i]] << QString("\n");
+        out << settings.keys()[i] << QString("=") << settings[settings.keys()[i]] << endl;
     configFile.close();
 }
 
@@ -281,7 +281,6 @@ QMap<QString, QString> SettingsWindow::readSettings()
     if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]";
 
     QMap<QString, QString> settings;
-
     settings[QString("CTRL_DIR")] = ui->lineEdit_wpaDir->text();
     settings[QString("CTRL_GROUP")] = ui->lineEdit_wpaGroup->text();
     settings[QString("IFACE_DIR")] = ui->lineEdit_interfacesDir->text();
@@ -299,7 +298,6 @@ QMap<QString, QString> SettingsWindow::readSettings()
     settings[QString("WPACLI_PATH")] = ui->lineEdit_wpaCliPath->text();
     settings[QString("WPASUP_PATH")] = ui->lineEdit_wpaSupPath->text();
     settings[QString("WPA_DRIVERS")] = ui->lineEdit_wpaSupDrivers->text();
-
     for (int i=0; i<settings.keys().count(); i++)
         if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]" << ":" <<
                     settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@@ -332,7 +330,6 @@ void SettingsWindow::setSettings(const QMap<QString, QString> settings)
     ui->lineEdit_wpaCliPath->setText(settings[QString("WPACLI_PATH")]);
     ui->lineEdit_wpaSupPath->setText(settings[QString("WPASUP_PATH")]);
     ui->lineEdit_wpaSupDrivers->setText(settings[QString("WPA_DRIVERS")]);
-
     for (int i=0; i<settings.keys().count(); i++)
         if (debug) qDebug() << "[SettingsWindow]" << "[setSettings]" << ":" <<
                     settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@@ -344,7 +341,6 @@ QMap<QString, QString> SettingsWindow::getDefault()
     if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]";
 
     QMap<QString, QString> settings;
-
     settings[QString("CTRL_DIR")] = QString("/run/wpa_supplicant_netctl-gui");
     settings[QString("CTRL_GROUP")] = QString("users");
     settings[QString("IFACE_DIR")] = QString("/sys/class/net/");
@@ -362,7 +358,6 @@ QMap<QString, QString> SettingsWindow::getDefault()
     settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli");
     settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
     settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");
-
     for (int i=0; i<settings.keys().count(); i++)
         if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]" << ":" <<
                     settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@@ -378,23 +373,18 @@ QMap<QString, QString> SettingsWindow::getSettings()
     QMap<QString, QString> settings = getDefault();
     QFile configFile(file);
     QString fileStr;
-
     if (!configFile.open(QIODevice::ReadOnly))
         return settings;
     while (true) {
-        fileStr = QString(configFile.readLine());
-        if (fileStr[0] != '#') {
-            if (fileStr.contains(QString("=")))
-                settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1]
-                        .remove(QChar(' '))
-                        .trimmed();
-        }
+        fileStr = QString(configFile.readLine()).trimmed();
+        if (fileStr[0] == QChar('#')) continue;
+        if (fileStr[0] == QChar(';')) continue;
+        if (!fileStr.contains(QChar('='))) continue;
+        settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
         if (configFile.atEnd())
             break;
     }
-
     configFile.close();
-
     for (int i=0; i<settings.keys().count(); i++)
         if (debug) qDebug() << "[SettingsWindow]" << "[getSettings]" << ":" <<
                     settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
diff --git a/sources/gui/src/tunnelwidget.cpp b/sources/gui/src/tunnelwidget.cpp
index 7769b01..60e3214 100644
--- a/sources/gui/src/tunnelwidget.cpp
+++ b/sources/gui/src/tunnelwidget.cpp
@@ -79,7 +79,7 @@ QString TunnelWidget::getIp(const QString rawIp)
         if (ip[i].toInt() > 255)
             ip[i] = QString("255");
 
-    return ip.join(QString("."));
+    return ip.join(QChar('.'));
 }
 
 
@@ -91,10 +91,10 @@ QMap<QString, QString> TunnelWidget::getSettings()
         return tunnelSettings;
 
     tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
-    if (!ui->lineEdit_local->text().split(QChar('.')).join(QString("")).remove(QString(" ")).isEmpty())
-        tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QString(" "))) + QString("'");
-    if (!ui->lineEdit_remote->text().split(QChar('.')).join(QString("")).remove(QString(" ")).isEmpty())
-        tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QString(" "))) + QString("'");
+    if (!ui->lineEdit_local->text().remove(QChar('.')).remove(QChar(' ')).isEmpty())
+        tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QChar(' '))) + QString("'");
+    if (!ui->lineEdit_remote->text().remove(QChar('.')).remove(QChar(' ')).isEmpty())
+        tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QChar(' '))) + QString("'");
 
     return tunnelSettings;
 }
@@ -114,10 +114,13 @@ void TunnelWidget::setSettings(const QMap<QString, QString> settings)
 
     if (tunnelSettings.contains(QString("Mode")))
         for (int i=0; i<ui->comboBox_mode->count(); i++)
-            if (tunnelSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
+            if (tunnelSettings[QString("Mode")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
                 ui->comboBox_mode->setCurrentIndex(i);
     if (tunnelSettings.contains(QString("Local")))
-        ui->lineEdit_local->setText(tunnelSettings[QString("Local")].remove(QString("'")));
+        ui->lineEdit_local->setText(tunnelSettings[QString("Local")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (tunnelSettings.contains(QString("Remote")))
-        ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")].remove(QString("'")));
+        ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")]
+                .remove(QChar('\'')).remove(QChar('"')));
 }
diff --git a/sources/gui/src/tuntapwidget.cpp b/sources/gui/src/tuntapwidget.cpp
index e19912e..00d234a 100644
--- a/sources/gui/src/tuntapwidget.cpp
+++ b/sources/gui/src/tuntapwidget.cpp
@@ -86,10 +86,13 @@ void TuntapWidget::setSettings(const QMap<QString, QString> settings)
 
     if (tuntapSettings.contains(QString("Mode")))
         for (int i=0; i<ui->comboBox_mode->count(); i++)
-            if (tuntapSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
+            if (tuntapSettings[QString("Mode")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
                 ui->comboBox_mode->setCurrentIndex(i);
     if (tuntapSettings.contains(QString("User")))
-        ui->lineEdit_user->setText(tuntapSettings[QString("User")].remove(QString("'")));
+        ui->lineEdit_user->setText(tuntapSettings[QString("User")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (tuntapSettings.contains(QString("Group")))
-        ui->lineEdit_group->setText(tuntapSettings[QString("Group")].remove(QString("'")));
+        ui->lineEdit_group->setText(tuntapSettings[QString("Group")]
+                .remove(QChar('\'')).remove(QChar('"')));
 }
diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp
index 9b6c714..a28a0c8 100644
--- a/sources/gui/src/wirelesswidget.cpp
+++ b/sources/gui/src/wirelesswidget.cpp
@@ -71,7 +71,7 @@ void WirelessWidget::clear()
                          QDir::separator() + QString("name"));
             QString deviceName;
             if (device.open(QIODevice::ReadOnly))
-                deviceName = QString(device.readLine()).remove(QString("\n"));
+                deviceName = QString(device.readLine()).trimmed();
             ui->comboBox_rfkill->addItem(deviceName);
         }
     }
@@ -227,7 +227,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
         QStringList section;
         for (int i=0; i<ui->listWidget_wpaConfigSection->count(); i++)
             section.append(QString("'") + ui->listWidget_wpaConfigSection->item(i)->text() + QString("'"));
-        wirelessSettings[QString("WPAConfigSection")] = QString("\n") + section.join(QString("\n")) + QString("\n");
+        wirelessSettings[QString("WPAConfigSection")] = QString("\n") + section.join(QChar('\n')) + QString("\n");
     }
     if (ui->comboBox_security->currentText() == QString("wpa-config"))
         wirelessSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'");
@@ -239,7 +239,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
         QStringList freqs;
         for (int i=0; i<ui->listWidget_freq->count(); i++)
             freqs.append(ui->listWidget_freq->item(i)->text());
-        wirelessSettings[QString("ScanFrequencies")] = freqs.join(QString(" "));
+        wirelessSettings[QString("ScanFrequencies")] = freqs.join(QChar(' '));
     }
     if (ui->spinBox_frequency->value() != 2000)
         wirelessSettings[QString("Frequency")] = QString::number(ui->spinBox_frequency->value());
@@ -253,7 +253,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
         QStringList drivers;
         for (int i=0; i<ui->listWidget_drivers->count(); i++)
             drivers.append(ui->listWidget_drivers->item(i)->text());
-        wirelessSettings[QString("WPADriver")] = QString("'") + drivers.join(QString(",")) + QString("'");
+        wirelessSettings[QString("WPADriver")] = QString("'") + drivers.join(QChar(',')) + QString("'");
     }
     if (ui->comboBox_rfkill->currentText() != QString("auto"))
         wirelessSettings[QString("RFKill")] = ui->comboBox_rfkill->currentText();
@@ -303,28 +303,35 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
 
     if (wirelessSettings.contains(QString("Security")))
         for (int i=0; i<ui->comboBox_security->count(); i++)
-            if (wirelessSettings[QString("Security")].remove(QString("'")) == ui->comboBox_security->itemText(i))
+            if (wirelessSettings[QString("Security")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_security->itemText(i))
                 ui->comboBox_security->setCurrentIndex(i);
     if (wirelessSettings.contains(QString("ESSID")))
-        ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")].remove(QString("'")));
+        ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("Key")))
-        ui->lineEdit_key->setText(wirelessSettings[QString("Key")].remove(QString("'")));
+        ui->lineEdit_key->setText(wirelessSettings[QString("Key")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("WPAConfigSection")))  {
         QStringList custom;
-        if (wirelessSettings[QString("WPAConfigSection")].contains(QString("\n")))
-            custom = wirelessSettings[QString("WPAConfigSection")].split(QString("'\n'"));
+        if (wirelessSettings[QString("WPAConfigSection")].contains(QChar('\n')))
+            custom = wirelessSettings[QString("WPAConfigSection")].split(String("'\n'"));
         else
             custom = wirelessSettings[QString("WPAConfigSection")].split(QString("' '"));
         for (int i=0; i<custom.count(); i++)
-            ui->listWidget_wpaConfigSection->addItem(custom[i].remove(QString("'")));
+            ui->listWidget_wpaConfigSection->addItem(custom[i]
+                                                     .remove(QChar('\'')).remove(QChar('"')));
     }
     if (wirelessSettings.contains(QString("WPAConfigFile")))
-        ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")].remove(QString("'")));
+        ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("Hidden")))
-        if (wirelessSettings[QString("Hidden")].remove(QString("'")) == QString("yes"))
+        if (wirelessSettings[QString("Hidden")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_hidden->setCheckState(Qt::Checked);
     if (wirelessSettings.contains(QString("AdHoc")))
-        if (wirelessSettings[QString("AdHoc")].remove(QString("'")) == QString("yes"))
+        if (wirelessSettings[QString("AdHoc")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_adhoc->setCheckState(Qt::Checked);
     if (wirelessSettings.contains(QString("ScanFrequencies")))
         ui->listWidget_freq->addItems(wirelessSettings[QString("ScanFrequencies")].split(QChar('\n')));
@@ -333,19 +340,23 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
     if (wirelessSettings.contains(QString("Priority")))
         ui->spinBox_priority->setValue(wirelessSettings[QString("Priority")].toInt());
     if (wirelessSettings.contains(QString("Country")))
-        ui->lineEdit_country->setText(wirelessSettings[QString("Country")].remove(QString("'")));
+        ui->lineEdit_country->setText(wirelessSettings[QString("Country")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("WPAGroup")))
-        ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")].remove(QString("'")));
+        ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")]
+                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("WPADriver")))
         ui->listWidget_drivers->addItems(wirelessSettings[QString("WPADriver")].split(QChar(',')));
     if (wirelessSettings.contains(QString("RFKill")))
         for (int i=0; i<ui->comboBox_rfkill->count(); i++)
-            if (wirelessSettings[QString("RFKill")].remove(QString("'")) == ui->comboBox_rfkill->itemText(i))
+            if (wirelessSettings[QString("RFKill")]
+                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_rfkill->itemText(i))
                 ui->comboBox_rfkill->setCurrentIndex(i);
     if (wirelessSettings.contains(QString("TimeoutWPA")))
         ui->spinBox_timeoutWpa->setValue(wirelessSettings[QString("TimeoutWPA")].toInt());
     if (wirelessSettings.contains(QString("ExcludeAuto")))
-        if (wirelessSettings[QString("ExcludeAuto")].remove(QString("'")) == QString("yes"))
+        if (wirelessSettings[QString("ExcludeAuto")]
+                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_exclude->setCheckState(Qt::Checked);
 
     changeSecurity(ui->comboBox_security->currentText());
diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp
index 09b42d2..3b36728 100644
--- a/sources/plasmoid/netctl.cpp
+++ b/sources/plasmoid/netctl.cpp
@@ -106,12 +106,11 @@ QMap<QString, QString> Netctl::readDataEngineConfiguration()
         fileStr = QString(confFile.readLine()).trimmed();
         if (fileStr[0] == QChar('#')) continue;
         if (fileStr[0] == QChar(';')) continue;
-        if (fileStr.contains(QChar('='))) {
-            value.clear();
-            for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
-                value.append(fileStr.split(QChar('='))[i]);
-            rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
-        }
+        if (!fileStr.contains(QChar('='))) continue;
+        value.clear();
+        for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
+            value.append(fileStr.split(QChar('='))[i]);
+        rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
         if (confFile.atEnd())
             break;
     }