diff --git a/.gitignore b/.gitignore
index 3129a9a..ac9cfa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+# Readme
 *.pyc
 build
 dist
diff --git a/device.py b/device.py
index 7827ec7..755965d 100644
--- a/device.py
+++ b/device.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8; -*-
+# -*- coding: utf-16; -*-
 
 import itertools
 import platform
diff --git a/icons.py b/icons.py
index 6d3a5a3..d41e5ac 100644
--- a/icons.py
+++ b/icons.py
@@ -36,14 +36,14 @@
     "Oih8eqtXM8qFyWKx+EGfLhl2WKio8/R7r22b+n3bLTlwj+/9ev4gwAAojC2jjutN0QAAAABJ"
     "RU5ErkJggg==")
 
-icon_16 = PyEmbeddedImage(
-    "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i"
-    "ZSBJbWFnZVJlYWR5ccllPAAAAbtJREFUeNqkk79Kw1AUxr9e88fEBCIYsI6dnaWDm119Bh0L"
-    "rkJdSgvtJkEHB6E+hR0FH8BH0E2xxaEg0g7JTVLvOUlvW7diCr38cs/58n0nN5Vut3sKoIrN"
-    "r3Gn0xkaaZoe9Hq9+0272+12k1YjyzLM53O8Pp7Bd03e3D8Z4O38HL5Z8oB4qNhlrj40QH0s"
-    "IKWs5HkOxxIIA5tvMgvF9ipbigPN1McCKgILpFJCJpILtpQ6s/zLCbNJ9apv4YAV9xsDnY/s"
-    "ke11bmguHRQRkiRhB08fTbh+kbnu32I0GsH3fWZany9GcM2Cj+92QX16BvQEyxEIwiJzNsvg"
-    "OA7CMGSezWawhIPADktH8XIGCwcylUhKWySoMmqbxFKmep/qtYM4jlmg7t0A0zKz+nmeh+l0"
-    "qnPXbzwsCvLcAvWtObh8v4S5U8ygH/TRevmB6RaZ+4cVtFqKyxlcXxvrDsii2Baw98oZxIot"
-    "B3awyPwFoWZg6xl8Lx2oAVXoJMqV9168plSfC83lPtVTHwuMx2NDqFMXVaPlQbeA6Ej94Uff"
-    "iKIlC2GA+lhgMpl81mq1q00/JvXQT1rZ/n+uXwEGAOa/G6mCJlcxAAAAAElFTkSuQmCC")
+#icon_16 = PyEmbeddedImage(
+#    "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i"
+#   "ZSBJbWFnZVJlYWR5ccllPAAAAbtJREFUeNqkk79Kw1AUxr9e88fEBCIYsI6dnaWDm119Bh0L"
+#    "rkJdSgvtJkEHB6E+hR0FH8BH0E2xxaEg0g7JTVLvOUlvW7diCr38cs/58n0nN5Vut3sKoIrN"
+#    "r3Gn0xkaaZoe9Hq9+0272+12k1YjyzLM53O8Pp7Bd03e3D8Z4O38HL5Z8oB4qNhlrj40QH0s"
+#    "IKWs5HkOxxIIA5tvMgvF9ipbigPN1McCKgILpFJCJpILtpQ6s/zLCbNJ9apv4YAV9xsDnY/s"
+#    "ke11bmguHRQRkiRhB08fTbh+kbnu32I0GsH3fWZany9GcM2Cj+92QX16BvQEyxEIwiJzNsvg"
+#    "OA7CMGSezWawhIPADktH8XIGCwcylUhKWySoMmqbxFKmep/qtYM4jlmg7t0A0zKz+nmeh+l0"
+#    "qnPXbzwsCvLcAvWtObh8v4S5U8ygH/TRevmB6RaZ+4cVtFqKyxlcXxvrDsii2Baw98oZxIot"
+#    "B3awyPwFoWZg6xl8Lx2oAVXoJMqV9168plSfC83lPtVTHwuMx2NDqFMXVaPlQbeA6Ej94Uff"
+#    "iKIlC2GA+lhgMpl81mq1q00/JvXQT1rZ/n+uXwEGAOa/G6mCJlcxAAAAAElFTkSuQmCC")
diff --git a/main.py b/main.py
index 70dfbab..2948723 100644
--- a/main.py
+++ b/main.py
@@ -10,7 +10,6 @@
 from device import CubeDevice
 
 
-#==============================================================================
 class CubeApp(wx.App):
     def __init__(self):
         super(CubeApp, self).__init__()
@@ -25,7 +24,6 @@ def Run(self):
         self.MainLoop()
         self.device.disconnect()
 
-#==============================================================================
 
 class TaskBarIcon(wx.TaskBarIcon):
     def __init__(self):
@@ -53,7 +51,6 @@ def OnLeftClick(self, event):
     def OnExit(self, event):
         wx.GetApp().GetTopWindow().Destroy()
 
-#==============================================================================
 class ActionPanel(wx.Panel):
     def __init__(self, parent, device):
         super(ActionPanel, self).__init__(parent)
@@ -106,7 +103,6 @@ def OnComboboxChanged(self, event):
         self.ShowPanel(self.mode_combobox.GetValue())
 
 
-#==============================================================================
 class MailPanel(wx.Panel):
     def __init__(self, parent, mode, show_imap_host_port):
         super(MailPanel, self).__init__(parent)
@@ -223,7 +219,6 @@ def OnStatusChanged(self, event):
         self.status_label.SetLabel(event.status)
 
 
-#==============================================================================
 class SlackPanel(MailPanel):
 
     def CreateCredentialsUI(self):
@@ -234,7 +229,6 @@ def CreateCredentialsUI(self):
         return res
 
 
-#==============================================================================
 class ManualControlPanel(wx.Panel):
     def __init__(self, parent, device):
         super(ManualControlPanel, self).__init__(parent)
@@ -266,7 +260,6 @@ def DeactivateMode(self):
         pass
 
 
-#==============================================================================
 class LongTaskPanel(wx.Panel):
     def __init__(self, parent, text):
         super(LongTaskPanel, self).__init__(parent)
@@ -296,7 +289,7 @@ def InitUI(self, text):
         panel.SetSizer(hbox)
         self.SetSizer(vbox)
 
-#==============================================================================
+
 PortSelectedEvent, EVT_PORT_SELECTED = NewEvent()
 
 class PortSelectionPanel(wx.Panel):
@@ -333,7 +326,7 @@ def OnSelectionChange(self, event):
         self.ok_button.Enable(self.listbox.GetSelection() != wx.NOT_FOUND)
 
 
-#==============================================================================
+
 SearchAgainEvent, EVT_SEARCH_AGAIN = NewEvent()
 
 class PortNotFoundPanel(wx.Panel):
@@ -361,7 +354,7 @@ def InitUI(self):
         self.SetSizer(vbox)
 
 
-#==============================================================================
+
 DiscoveredEvent, EVT_DISCOVERED = NewEvent()
 ConnectedEvent, EVT_CONNECTED = NewEvent()