diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index 986790a..2b53144 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -37,9 +37,9 @@ add_subdirectory (icons)
 if (BUILD_GUI)
   add_subdirectory (gui)
 endif ()
-if (BUILD_DATAENGINE)
-  add_subdirectory (dataengine)
-endif ()
-if (BUILD_PLASMOID)
-  add_subdirectory (plasmoid)
-endif ()
+# if (BUILD_DATAENGINE)
+#   add_subdirectory (dataengine)
+# endif ()
+# if (BUILD_PLASMOID)
+#   add_subdirectory (plasmoid)
+# endif ()
diff --git a/sources/gui/src/CMakeLists.txt b/sources/gui/src/CMakeLists.txt
index 78b90f1..24c8873 100644
--- a/sources/gui/src/CMakeLists.txt
+++ b/sources/gui/src/CMakeLists.txt
@@ -14,29 +14,34 @@ message (STATUS "${SUBPROJECT} Forms: ${FORMS}")
 # include_path
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../)
 
-find_package (Qt4 REQUIRED)
-include (${QT_USE_FILE})
-qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
-qt4_wrap_ui (UI_HEADERS ${FORMS})
-qt4_add_resources (QRC_SOURCES ${RESOURCES})
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+add_definitions(${Qt5Core_DEFINITIONS})
+add_definitions(${Qt5Widgets_DEFINITIONS})
+add_definitions(${Qt5LinguistTools_DEFINITIONS})
+qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
+qt5_wrap_ui (UI_HEADERS ${FORMS})
+qt5_add_resources (QRC_SOURCES ${RESOURCES})
 
 foreach (LANGUAGE ${LANGUAGES})
     set (TS ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts)
     set (QM ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm)
     set (TRANSLATIONS ${TRANSLATIONS} ${TS})
     set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
-    add_custom_command (OUTPUT ${QM} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
+    add_custom_command (OUTPUT ${QM} COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
 endforeach ()
-add_custom_target (translations COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
-add_custom_command (TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+add_custom_target (translations COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
+add_custom_command (TARGET translations COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
 message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}")
 
 source_group ("Header Files" FILES ${HEADERS})
 source_group ("Source Files" FILES ${SOURCES})
 source_group ("Generated Files" FILES ${MOC_SOURCES})
 
+include_directories (${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
 add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
-target_link_libraries (${SUBPROJECT} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+target_link_libraries (${SUBPROJECT} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES})
 
 # install properties
 install (TARGETS ${SUBPROJECT} DESTINATION bin)
diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp
index 3251845..841d7fc 100644
--- a/sources/gui/src/ethernetwidget.cpp
+++ b/sources/gui/src/ethernetwidget.cpp
@@ -86,7 +86,7 @@ void EthernetWidget::selectWpaConfig()
 void EthernetWidget::showAdvanced()
 {
     if (ui->pushButton_ethernetAdvanced->isChecked()) {
-        ui->widget_ethernetAdvanced->setShown(true);
+        ui->widget_ethernetAdvanced->setHidden(false);
         ui->pushButton_ethernetAdvanced->setText(QApplication::translate("EthernetWidget", "Hide advanced"));
     }
     else {
@@ -101,7 +101,7 @@ void EthernetWidget::showWpa(const int state)
     if (state == 0)
         ui->widget_wpa->setHidden(true);
     else
-        ui->widget_wpa->setShown(true);
+        ui->widget_wpa->setHidden(false);
 }
 
 
diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp
index e751213..95570b9 100644
--- a/sources/gui/src/generalwidget.cpp
+++ b/sources/gui/src/generalwidget.cpp
@@ -112,7 +112,7 @@ void GeneralWidget::keyPressEvent(QKeyEvent *pressedKey)
 void GeneralWidget::showAdvanced()
 {
     if (ui->pushButton_generalAdvanced->isChecked()) {
-        ui->widget_generalAdvanced->setShown(true);
+        ui->widget_generalAdvanced->setHidden(false);
         ui->pushButton_generalAdvanced->setText(QApplication::translate("GeneralWidget", "Hide advanced"));
     }
     else {
diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp
index a6c9a14..2a8d34d 100644
--- a/sources/gui/src/ipwidget.cpp
+++ b/sources/gui/src/ipwidget.cpp
@@ -306,7 +306,7 @@ void IpWidget::changeIpMode(const QString currentText)
     if (currentText == QString("dhcp"))
         ui->widget_ip->setHidden(true);
     else if (currentText == QString("static"))
-        ui->widget_ip->setShown(true);
+        ui->widget_ip->setHidden(false);
 }
 
 
@@ -332,7 +332,7 @@ void IpWidget::changeIp6Mode(const QString currentText)
         ui->widget_ip6->setHidden(true);
     else if ((currentText == QString("static")) ||
              (currentText == QString("stateless")))
-        ui->widget_ip6->setShown(true);
+        ui->widget_ip6->setHidden(false);
 }
 
 
@@ -354,12 +354,12 @@ void IpWidget::ip6Enable(const int state)
 void IpWidget::changeDhcpClient(const QString currentText)
 {
     if (currentText == QString("dhcpcd")) {
-        ui->widget_dhcpcdOpt->setShown(true);
+        ui->widget_dhcpcdOpt->setHidden(false);
         ui->widget_dhclientOpt->setHidden(true);
     }
     else if (currentText == QString("dhclient")) {
         ui->widget_dhcpcdOpt->setHidden(true);
-        ui->widget_dhclientOpt->setShown(true);
+        ui->widget_dhclientOpt->setHidden(false);
     }
 }
 
@@ -367,7 +367,7 @@ void IpWidget::changeDhcpClient(const QString currentText)
 void IpWidget::showAdvanced()
 {
     if (ui->pushButton_ipAdvanced->isChecked()) {
-        ui->widget_ipAdvanced->setShown(true);
+        ui->widget_ipAdvanced->setHidden(false);
         ui->pushButton_ipAdvanced->setText(QApplication::translate("IpWidget", "Hide advanced"));
     }
     else {
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index 815757b..8abc027 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -224,7 +224,7 @@ void MainWindow::updateMainTab()
 
     ui->tableWidget_main->setSortingEnabled(true);
     ui->tableWidget_main->resizeRowsToContents();
-    ui->tableWidget_main->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    ui->tableWidget_main->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tabWidget->setEnabled(true);
     ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));
 
@@ -284,7 +284,7 @@ void MainWindow::updateWifiTab()
 
     ui->tableWidget_wifi->setSortingEnabled(true);
     ui->tableWidget_wifi->resizeRowsToContents();
-    ui->tableWidget_wifi->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    ui->tableWidget_wifi->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tabWidget->setEnabled(true);
     ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));
 
diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp
index 8434152..3446b25 100644
--- a/sources/gui/src/mobilewidget.cpp
+++ b/sources/gui/src/mobilewidget.cpp
@@ -87,7 +87,7 @@ void MobileWidget::selectOptionsFile()
 void MobileWidget::showAdvanced()
 {
     if (ui->pushButton_mobileAdvanced->isChecked()) {
-        ui->widget_mobileAdvanced->setShown(true);
+        ui->widget_mobileAdvanced->setHidden(false);
         ui->pushButton_mobileAdvanced->setText(QApplication::translate("MobileWidget", "Hide advanced"));
     }
     else {
diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp
index 9e8ca5f..5018c68 100644
--- a/sources/gui/src/pppoewidget.cpp
+++ b/sources/gui/src/pppoewidget.cpp
@@ -96,7 +96,7 @@ void PppoeWidget::changeMode(const QString currentText)
     if (currentText == QString("persist"))
         ui->widget_timeout->setHidden(true);
     else if (currentText == QString("demand"))
-        ui->widget_timeout->setShown(true);
+        ui->widget_timeout->setHidden(false);
 }
 
 
@@ -115,7 +115,7 @@ void PppoeWidget::selectOptionsFile()
 void PppoeWidget::showAdvanced()
 {
     if (ui->pushButton_pppoeAdvanced->isChecked()) {
-        ui->widget_pppoeAdvanced->setShown(true);
+        ui->widget_pppoeAdvanced->setHidden(false);
         ui->pushButton_pppoeAdvanced->setText(QApplication::translate("PppoeWidget", "Hide advanced"));
     }
     else {
diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp
index 3750068..f1f6786 100644
--- a/sources/gui/src/wirelesswidget.cpp
+++ b/sources/gui/src/wirelesswidget.cpp
@@ -153,28 +153,28 @@ void WirelessWidget::addOption()
 void WirelessWidget::changeSecurity(const QString currentText)
 {
     if (currentText == QString("none")) {
-        ui->widget_essid->setShown(true);
+        ui->widget_essid->setHidden(false);
         ui->widget_wpaConfigSection->setHidden(true);
         ui->widget_wpaConfig->setHidden(true);
         ui->widget_key->setHidden(true);
     }
     else if ((currentText == QString("wep")) ||
              (currentText == QString("wpa"))) {
-        ui->widget_essid->setShown(true);
+        ui->widget_essid->setHidden(false);
         ui->widget_wpaConfigSection->setHidden(true);
         ui->widget_wpaConfig->setHidden(true);
-        ui->widget_key->setShown(true);
+        ui->widget_key->setHidden(false);
     }
     else if (currentText == QString("wpa-configsection")) {
         ui->widget_essid->setHidden(true);
-        ui->widget_wpaConfigSection->setShown(true);
+        ui->widget_wpaConfigSection->setHidden(false);
         ui->widget_wpaConfig->setHidden(true);
         ui->widget_key->setHidden(true);
     }
     else if (currentText == QString("wpa-config")) {
         ui->widget_essid->setHidden(true);
         ui->widget_wpaConfigSection->setHidden(true);
-        ui->widget_wpaConfig->setShown(true);
+        ui->widget_wpaConfig->setHidden(false);
         ui->widget_key->setHidden(true);
     }
 }
@@ -195,7 +195,7 @@ void WirelessWidget::selectWpaConfig()
 void WirelessWidget::showAdvanced()
 {
     if (ui->pushButton_wirelessAdvanced->isChecked()) {
-        ui->widget_wirelessAdvanced->setShown(true);
+        ui->widget_wirelessAdvanced->setHidden(false);
         ui->pushButton_wirelessAdvanced->setText(QApplication::translate("WirelessWidget", "Hide advanced"));
     }
     else {