diff --git a/sources/ptm/contents/code/advanced.py b/sources/ptm/contents/code/advanced.py
index fad5406..5c4f80c 100644
--- a/sources/ptm/contents/code/advanced.py
+++ b/sources/ptm/contents/code/advanced.py
@@ -40,67 +40,12 @@ class AdvancedWindow(QWidget):
         self.parent = parent
 
         QObject.connect(self.ui.checkBox_netdev, SIGNAL("stateChanged(int)"), self.setNetdevEnabled)
-        QObject.connect(self.ui.pushButton_hddDevice, SIGNAL("clicked()"), self.addHddDevice)
-        QObject.connect(self.ui.pushButton_hddSpeedDevice, SIGNAL("clicked()"), self.addHddSpeedDevice)
-        QObject.connect(self.ui.pushButton_mount, SIGNAL("clicked()"), self.addMount)
-        QObject.connect(self.ui.pushButton_tempDevice, SIGNAL("clicked()"), self.addTempDevice)
         QObject.connect(self.ui.listWidget_hddDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddDevice.openPersistentEditor)
         QObject.connect(self.ui.listWidget_hddSpeedDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddSpeedDevice.openPersistentEditor)
         QObject.connect(self.ui.listWidget_mount, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_mount.openPersistentEditor)
         QObject.connect(self.ui.listWidget_tempDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_tempDevice.openPersistentEditor)
 
 
-    def keyPressEvent(self, event):
-        """delete events"""
-        if self.debug: qDebug("[PTM] [advanced.py] [keyPressEvent]")
-        if self.debug: qDebug("[PTM] [advanced.py] [keyPressEvent] : Run function with event '%s'" %(event.key()))
-        if (event.key() == Qt.Key_Delete):
-            if (self.ui.listWidget_hddDevice.hasFocus() and
-                (self.ui.listWidget_hddDevice.currentRow() > -1)):
-                self.ui.listWidget_hddDevice.takeItem(self.ui.listWidget_hddDevice.currentRow())
-            elif (self.ui.listWidget_hddSpeedDevice.hasFocus() and
-                (self.ui.listWidget_hddSpeedDevice.currentRow() > -1)):
-                self.ui.listWidget_hddSpeedDevice.takeItem(self.ui.listWidget_hddSpeedDevice.currentRow())
-            elif (self.ui.listWidget_mount.hasFocus() and
-                (self.ui.listWidget_mount.currentRow() > -1)):
-                self.ui.listWidget_mount.takeItem(self.ui.listWidget_mount.currentRow())
-            elif (self.ui.listWidget_tempDevice.hasFocus() and
-                (self.ui.listWidget_tempDevice.currentRow() > -1)):
-                self.ui.listWidget_tempDevice.takeItem(self.ui.listWidget_tempDevice.currentRow())
-
-
-    def addHddDevice(self):
-        """function to add mount points"""
-        if self.debug: qDebug("[PTM] [advanced.py] [addHddDevice]")
-        if self.debug: qDebug("[PTM] [advanced.py] [addHddDevice] : Device '%s'" %(self.ui.comboBox_hddDevice.currentText()))
-        self.ui.listWidget_hddDevice.clearSelection()
-        self.ui.listWidget_hddDevice.addItem(self.ui.comboBox_hddDevice.currentText())
-
-
-    def addHddSpeedDevice(self):
-        """function to add disk device"""
-        if self.debug: qDebug("[PTM] [advanced.py] [addHddSpeedDevice]")
-        if self.debug: qDebug("[PTM] [advanced.py] [addHddSpeedDevice] : Device '%s'" %(self.ui.comboBox_hddSpeedDevice.currentText()))
-        self.ui.listWidget_hddSpeedDevice.clearSelection()
-        self.ui.listWidget_hddSpeedDevice.addItem(self.ui.comboBox_hddSpeedDevice.currentText())
-
-
-    def addMount(self):
-        """function to add mount points"""
-        if self.debug: qDebug("[PTM] [advanced.py] [addMount]")
-        if self.debug: qDebug("[PTM] [advanced.py] [addMount] : Device '%s'" %(self.ui.comboBox_mount.currentText()))
-        self.ui.listWidget_mount.clearSelection()
-        self.ui.listWidget_mount.addItem(self.ui.comboBox_mount.currentText())
-
-
-    def addTempDevice(self):
-        """function to add temperature device"""
-        if self.debug: qDebug("[PTM] [advanced.py] [addTempDevice]")
-        if self.debug: qDebug("[PTM] [advanced.py] [addTempDevice] : Device '%s'" %(self.ui.comboBox_tempDevice.currentText()))
-        self.ui.listWidget_tempDevice.clearSelection()
-        self.ui.listWidget_tempDevice.addItem(self.ui.comboBox_tempDevice.currentText())
-
-
     def setNetdevEnabled(self):
         """function to set enabled netdev"""
         if self.debug: qDebug("[PTM] [advanced.py] [setNetdevEnabled]")
diff --git a/sources/ptm/contents/code/configdef.py b/sources/ptm/contents/code/configdef.py
index ce05d62..9e7b4cd 100644
--- a/sources/ptm/contents/code/configdef.py
+++ b/sources/ptm/contents/code/configdef.py
@@ -65,20 +65,24 @@ class ConfigDefinition:
         settings.set('temp_units', str(self.configpage['advanced'].ui.comboBox_tempUnits.currentText()))
         item = QStringList()
         for i in range(self.configpage['advanced'].ui.listWidget_tempDevice.count()):
-            item.append(self.configpage['advanced'].ui.listWidget_tempDevice.item(i).text())
+            if (self.configpage['advanced'].ui.listWidget_tempDevice.item(i).checkState() == Qt.Checked):
+                item.append(self.configpage['advanced'].ui.listWidget_tempDevice.item(i).text())
         settings.set('temp_device', str(item.join(QString('@@'))))
         item = QStringList()
         for i in range(self.configpage['advanced'].ui.listWidget_mount.count()):
-            item.append(self.configpage['advanced'].ui.listWidget_mount.item(i).text())
+            if (self.configpage['advanced'].ui.listWidget_mount.item(i).checkState() == Qt.Checked):
+                item.append(self.configpage['advanced'].ui.listWidget_mount.item(i).text())
         settings.set('mount', str(item.join(QString('@@'))))
         item = QStringList()
-        for i in range(self.configpage['advanced'].ui.listWidget_hddDevice.count()):
-            item.append(self.configpage['advanced'].ui.listWidget_hddDevice.item(i).text())
-        settings.set('hdd', str(item.join(QString('@@'))))
-        item = QStringList()
         for i in range(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.count()):
-            item.append(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).text())
+            if (self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).checkState() == Qt.Checked):
+                item.append(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).text())
         settings.set('disk', str(item.join(QString('@@'))))
+        item = QStringList()
+        for i in range(self.configpage['advanced'].ui.listWidget_hddDevice.count()):
+            if (self.configpage['advanced'].ui.listWidget_hddDevice.item(i).checkState() == Qt.Checked):
+                item.append(self.configpage['advanced'].ui.listWidget_hddDevice.item(i).text())
+        settings.set('hdd', str(item.join(QString('@@'))))
         settings.set('netdir', str(self.configpage['advanced'].ui.lineEdit_netdir.text()))
         settings.set('netdevBool', self.configpage['advanced'].ui.checkBox_netdev.checkState())
         settings.set('custom_netdev', str(self.configpage['advanced'].ui.comboBox_netdev.currentText()))
@@ -170,44 +174,56 @@ class ConfigDefinition:
         self.configpage['advanced'].ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
         index = self.configpage['advanced'].ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))
         self.configpage['advanced'].ui.comboBox_tempUnits.setCurrentIndex(index)
+        self.configpage['advanced'].ui.listWidget_tempDevice.clear()
         commandOut = commands.getoutput("sensors")
         for item in commandOut.split("\n\n"):
             for device in item.split("\n"):
                 if (device.find('\xc2\xb0C') > -1):
                     try:
-                        tempdev = 'lmsensors/' + item.split("\n")[0] + '/' + '_'.join(device.split(":")[0].split())
-                        self.configpage['advanced'].ui.comboBox_tempDevice.addItem(tempdev)
+                        listItem = QListWidgetItem('lmsensors/' + item.split("\n")[0] + '/' + '_'.join(device.split(":")[0].split()))
+                        listItem.setCheckState(0)
+                        self.configpage['advanced'].ui.listWidget_tempDevice.addItem(listItem)
                     except:
                         pass
-        self.configpage['advanced'].ui.listWidget_tempDevice.clear()
         for item in str(settings.get('temp_device', '')).split('@@'):
-            if (len(item) > 0):
-                self.configpage['advanced'].ui.listWidget_tempDevice.addItem(item)
+            items = self.configpage['advanced'].ui.listWidget_tempDevice.findItems(item, Qt.MatchFixedString)
+            for listItem in items:
+                listItem.setCheckState(2)
+        self.configpage['advanced'].ui.listWidget_mount.clear()
         commandOut = commands.getoutput("mount")
         for item in commandOut.split("\n"):
             try:
-                mount = item.split(' on ')[1].split(' type ')[0]
-                self.configpage['advanced'].ui.comboBox_mount.addItem(mount)
+                listItem = QListWidgetItem(item.split(' on ')[1].split(' type ')[0])
+                listItem.setCheckState(0)
+                self.configpage['advanced'].ui.listWidget_mount.addItem(listItem)
             except:
                 pass
-        self.configpage['advanced'].ui.listWidget_mount.clear()
         for item in str(settings.get('mount', '/')).split('@@'):
-            self.configpage['advanced'].ui.listWidget_mount.addItem(item)
+            items = self.configpage['advanced'].ui.listWidget_mount.findItems(item, Qt.MatchFixedString)
+            for listItem in items:
+                listItem.setCheckState(2)
+        self.configpage['advanced'].ui.listWidget_hddSpeedDevice.clear()
+        for item in self.defaults['disk']:
+            listItem = QListWidgetItem(item)
+            listItem.setCheckState(0)
+            self.configpage['advanced'].ui.listWidget_hddSpeedDevice.addItem(listItem)
+        for item in str(settings.get('disk', 'disk/sda_(8:0)')).split('@@'):
+            items = self.configpage['advanced'].ui.listWidget_hddSpeedDevice.findItems(item, Qt.MatchFixedString)
+            for listItem in items:
+                listItem.setCheckState(2)
+        self.configpage['advanced'].ui.listWidget_hddDevice.clear()
         commandOut = commands.getoutput("find /dev -name '[hms]d[a-z]'")
         for item in commandOut.split("\n"):
             try:
-                self.configpage['advanced'].ui.comboBox_hddDevice.addItem(item)
+                listItem = QListWidgetItem(item)
+                listItem.setCheckState(0)
+                self.configpage['advanced'].ui.listWidget_hddDevice.addItem(listItem)
             except:
                 pass
-        self.configpage['advanced'].ui.listWidget_hddDevice.clear()
         for item in str(settings.get('hdd', '/dev/sda')).split('@@'):
-            self.configpage['advanced'].ui.listWidget_hddDevice.addItem(item)
-        self.configpage['advanced'].ui.comboBox_hddSpeedDevice.clear()
-        for item in self.defaults['disk']:
-            self.configpage['advanced'].ui.comboBox_hddSpeedDevice.addItem(item)
-        self.configpage['advanced'].ui.listWidget_hddSpeedDevice.clear()
-        for item in str(settings.get('disk', 'disk/sda_(8:0)')).split('@@'):
-            self.configpage['advanced'].ui.listWidget_hddSpeedDevice.addItem(item)
+            items = self.configpage['advanced'].ui.listWidget_hddDevice.findItems(item, Qt.MatchFixedString)
+            for listItem in items:
+                listItem.setCheckState(2)
         self.configpage['advanced'].ui.lineEdit_netdir.setText(str(settings.get('netdir', '/sys/class/net')))
         self.configpage['advanced'].ui.checkBox_netdev.setCheckState(settings.get('netdevBool', 0).toInt()[0])
         for item in QDir.entryList(QDir(str(settings.get('netdir', '/sys/class/net'))), QDir.Dirs | QDir.NoDotAndDotDot):
diff --git a/sources/ptm/contents/ui/advanced.ui b/sources/ptm/contents/ui/advanced.ui
index 80998ad..394a0e0 100644
--- a/sources/ptm/contents/ui/advanced.ui
+++ b/sources/ptm/contents/ui/advanced.ui
@@ -42,8 +42,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>666</width>
-        <height>848</height>
+        <width>677</width>
+        <height>752</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -214,53 +214,22 @@ $m - uptime minutes without zero</string>
        <item>
         <layout class="QVBoxLayout" name="layout_tempDevice">
          <item>
-          <layout class="QHBoxLayout" name="layout_tempDeviceSelect">
-           <item>
-            <widget class="QLabel" name="label_tempDevice">
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Temperature devices</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_tempDevice">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="editable">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_tempDevice">
-             <property name="minimumSize">
-              <size>
-               <width>100</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QLabel" name="label_tempDevice">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Temperature devices</string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QListWidget" name="listWidget_tempDevice">
            <property name="toolTip">
-            <string>Editable
-del - remove item</string>
+            <string>Editable</string>
            </property>
           </widget>
          </item>
@@ -269,47 +238,17 @@ del - remove item</string>
        <item>
         <layout class="QVBoxLayout" name="layout_mount">
          <item>
-          <layout class="QHBoxLayout" name="layout_mountSelect">
-           <item>
-            <widget class="QLabel" name="label_mount">
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Mount points</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_mount">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="editable">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_mount">
-             <property name="minimumSize">
-              <size>
-               <width>100</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QLabel" name="label_mount">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Mount points</string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QListWidget" name="listWidget_mount">
@@ -324,44 +263,17 @@ del - remove item</string>
        <item>
         <layout class="QVBoxLayout" name="layout_hddSpeedDevice">
          <item>
-          <layout class="QHBoxLayout" name="layout_hddSpeedDeviceSelect">
-           <item>
-            <widget class="QLabel" name="label_hddSpeedDevice">
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>HDD devices (speed)</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_hddSpeedDevice">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_hddSpeedDevice">
-             <property name="minimumSize">
-              <size>
-               <width>100</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QLabel" name="label_hddSpeedDevice">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>HDD devices (speed)</string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QListWidget" name="listWidget_hddSpeedDevice">
@@ -376,47 +288,17 @@ del - remove item</string>
        <item>
         <layout class="QVBoxLayout" name="layout_hddDevice">
          <item>
-          <layout class="QHBoxLayout" name="layout_hddDeviceSelect">
-           <item>
-            <widget class="QLabel" name="label_hddDevice">
-             <property name="minimumSize">
-              <size>
-               <width>200</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>HDD devices (temp)</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="comboBox_hddDevice">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="editable">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="pushButton_hddDevice">
-             <property name="minimumSize">
-              <size>
-               <width>100</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QLabel" name="label_hddDevice">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>HDD devices (temp)</string>
+           </property>
+          </widget>
          </item>
          <item>
           <widget class="QListWidget" name="listWidget_hddDevice">
@@ -628,17 +510,9 @@ del - remove item</string>
   <tabstop>lineEdit_timeFormat</tabstop>
   <tabstop>lineEdit_uptimeFormat</tabstop>
   <tabstop>comboBox_tempUnits</tabstop>
-  <tabstop>comboBox_tempDevice</tabstop>
-  <tabstop>pushButton_tempDevice</tabstop>
   <tabstop>listWidget_tempDevice</tabstop>
-  <tabstop>comboBox_mount</tabstop>
-  <tabstop>pushButton_mount</tabstop>
   <tabstop>listWidget_mount</tabstop>
-  <tabstop>comboBox_hddSpeedDevice</tabstop>
-  <tabstop>pushButton_hddSpeedDevice</tabstop>
   <tabstop>listWidget_hddSpeedDevice</tabstop>
-  <tabstop>comboBox_hddDevice</tabstop>
-  <tabstop>pushButton_hddDevice</tabstop>
   <tabstop>listWidget_hddDevice</tabstop>
   <tabstop>lineEdit_netdir</tabstop>
   <tabstop>checkBox_netdev</tabstop>