Refactoring and some bug fixes

src/__main__.py

@@ -5,10 +5,10 @@
 import argparse
 from setproctitle import setproctitle
 
-# Gtk imports
+# Lib imports
 import gi, faulthandler, signal
 gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk as gtk
+from gi.repository import Gtk
 from gi.repository import GLib
 
 # Application imports
@@ -18,7 +18,7 @@ from __init__ import Main
 if __name__ == "__main__":
     try:
         setproctitle('Cornea')
-        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, gtk.main_quit)
+        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit)
         faulthandler.enable()  # For better debug info
         parser = argparse.ArgumentParser()
         # Add long and short arguments
@@ -27,6 +27,6 @@ if __name__ == "__main__":
         # Read arguments (If any...)
         args = parser.parse_args()
         main = Main(args)
-        gtk.main()
+        Gtk.main()
     except Exception as e:
         print( repr(e) )