diff --git a/.idea/Searcher.iml b/.idea/Searcher.iml
index 2494daa..e5da05c 100644
--- a/.idea/Searcher.iml
+++ b/.idea/Searcher.iml
@@ -17,4 +17,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Python 2.7 interpreter library" level="application" />
   </component>
+  <component name="PackageRequirementsSettings">
+    <option name="requirementsPath" value="" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="renderExternalDocumentation" value="true" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/456.py b/456.py
index f917afd..49ac8f4 100644
--- a/456.py
+++ b/456.py
@@ -7,7 +7,6 @@
 from searcher import ptime as ptime
 from searcher import language_en as la
 
-
 from peewee import *
 from peewee import SQL
 from playhouse.sqlite_ext import SqliteExtDatabase, RowIDField, FTS5Model, SearchField
@@ -29,18 +28,22 @@
     inspect.getsourcefile(lambda: 0)
 )
 
+
 def get_platform():
     return getattr(hou.session, "PLATFORM", None)
 
+
 def get_settings():
     return getattr(hou.session, "SETTINGS", None)
 
+
 def get_dbconnection():
     return getattr(hou.session, "DBCONNECTION", None)
 
+
 scriptpath = os.path.dirname(current_file_path)
 dbfile = "searcher.db"
-dbpath =  os.path.join(
+dbpath = os.path.join(
     hou.homeHoudiniDirectory(), 'Searcher', dbfile
 )
 
@@ -51,6 +54,7 @@ def get_dbconnection():
 isloading = True
 tempkey = ""
 
+
 # --------------------------------------------------------- DatabaseModels
 # SECTION DatabaseModels -------------------------------------------------
 # ------------------------------------------------ Settings
@@ -68,6 +72,7 @@ class Meta:
         table_name = 'settings'
         database = db
 
+
 # ------------------------------------------------ HContext
 # NOTE HContext -------------------------------------------
 class HContext(Model):
@@ -80,6 +85,7 @@ class Meta:
         table_name = 'hcontext'
         database = db
 
+
 # # ------------------------------------------- HContextIndex
 # # NOTE HContextIndex --------------------------------------
 # class HContextIndex(FTS5Model):
@@ -105,6 +111,7 @@ class Meta:
         table_name = 'hotkeys'
         database = db
 
+
 # -------------------------------------------- HotkeysIndex
 # NOTE HotkeysIndex ---------------------------------------
 class HotkeysIndex(FTS5Model):
@@ -119,17 +126,22 @@ class Meta:
         # table_name = 'hotkeysindex'
         database = db
         options = {'prefix': [2, 3], 'tokenize': 'porter'}
+
+
 # !SECTION DatabaseModels
 
 def create_tables(dbc):
     dbc.create_tables([Settings, HContext, Hotkeys, HotkeysIndex])
 
+
 def worker():
     hd.executeInMainThreadWithResult(updatecontext)
 
+
 def py_unique(data):
     return list(set(data))
 
+
 # ------------------------------------------------- getdata
 # NOTE getdata --------------------------------------------
 def getdata():
@@ -143,8 +155,8 @@ def getcontexts(r, context_symbol, root):
         for branch in branches:
             branch_path = "%s/%s" % (r, branch['label'])
             contextdata.append({
-                'context': branch['symbol'], 
-                'title': branch['label'], 
+                'context': branch['symbol'],
+                'title': branch['label'],
                 'description': branch['help']
             })
             commands = hou.hotkeys.commandsInContext(branch['symbol'])
@@ -152,10 +164,10 @@ def getcontexts(r, context_symbol, root):
                 keys = hou.hotkeys.assignments(command['symbol'])
                 ctx = command['symbol'].rsplit('.', 1)
                 hotkeydata.append({
-                    'hotkey_symbol': command['symbol'], 
-                    'label': command['label'], 
+                    'hotkey_symbol': command['symbol'],
+                    'label': command['label'],
                     'description': command['help'],
-                    'assignments': " ".join(keys), 
+                    'assignments': " ".join(keys),
                     'context': ctx[0]
                 })
             getcontexts(branch_path, branch['symbol'], root)
@@ -163,6 +175,7 @@ def getcontexts(r, context_symbol, root):
     getcontexts("", "", rval)
     return contextdata, hotkeydata
 
+
 # -------------------------------------------- initialsetup
 # NOTE initialsetup ---------------------------------------
 def initialsetup(cur):
@@ -190,6 +203,7 @@ def initialsetup(cur):
             hou.ui.setStatusMessage(
                 la.MESSAGES['initialsetup2'], severity=hou.severityType.Message)
 
+
 # --------------------------------------------------------------- Retrieve
 # SECTION Retrieve -------------------------------------------------------
 # ------------------------------------------ getchangeindex
@@ -206,6 +220,7 @@ def getchangeindex(cur):
         else:
             print(la.DBERRORMSG['getchangeindex'] + str(e))
 
+
 # ------------------------------------------- getlastusedhk
 # NOTE getlastusedhk --------------------------------------
 def getlastusedhk(cur):
@@ -258,6 +273,8 @@ def getlastusedhk(cur):
                 (la.DBERRORMSG['getlastusedhk1'] + str(e)), severity=hou.severityType.Warning)
         else:
             print(la.DBERRORMSG['getlastusedhk1'] + str(e))
+
+
 # !SECTION
 
 # ----------------------------------------------------------------- Update
@@ -273,6 +290,7 @@ def dbupdate(cur):
         updatedataasync()
         updatechangeindex(int(currentidx))
 
+
 # ----------------------------------------- updatedataasync
 # NOTE updatedataasync ------------------------------------
 def updatedataasync():
@@ -280,6 +298,7 @@ def updatedataasync():
     thread.daemon = True
     thread.start()
 
+
 # --------------------------------------- updatechangeindex
 # NOTE updatechangeindex ----------------------------------
 def updatechangeindex(indexval, new=False):
@@ -292,12 +311,12 @@ def updatechangeindex(indexval, new=False):
                     defaultkey = util.HOTKEYLIST[i]
 
             Settings.insert(
-                indexvalue=indexval, 
-                defaulthotkey=defaultkey, 
-                searchdescription=0, 
-                searchprefix=0, 
-                searchcurrentcontext=0, 
-                lastused="", 
+                indexvalue=indexval,
+                defaulthotkey=defaultkey,
+                searchdescription=0,
+                searchprefix=0,
+                searchcurrentcontext=0,
+                lastused="",
                 id=1).execute()
         else:
             Settings.update(indexvalue=indexval).where(
@@ -309,6 +328,7 @@ def updatechangeindex(indexval, new=False):
         else:
             print(la.DBERRORMSG['updatechangeindex'] + str(e))
 
+
 # ------------------------------------------- updatecontext
 # NOTE updatecontext --------------------------------------
 def updatecontext(debug=False):
@@ -326,6 +346,8 @@ def updatecontext(debug=False):
     except(AttributeError, TypeError) as e:
         hou.ui.setStatusMessage(
             (la.DBERRORMSG['updatecontext'] + str(e)), severity=hou.severityType.Warning)
+
+
 # endregion
 
 # ------------------------------------------- cleardatabase
@@ -347,24 +369,29 @@ def cleardatabase():
                 (la.DBERRORMSG['cleardatabase'] + str(e)), severity=hou.severityType.Warning)
         else:
             print(la.DBERRORMSG['cleardatabase'] + str(e))
+
+
 # !SECTION
 
 def deferaction(action, val):
     hd.executeDeferred(action, val)
 
+
 def checklasthk(cur):
     getlastusedhk(cur)
 
+
 def main():
     platform = get_platform()
     platform = platformselect.get_platform()
-    
+
     if not os.path.exists(settings_data.searcher_path):
         os.mkdir(settings_data.searcher_path)
     if not os.path.isfile(settings_data.searcher_settings):
         if platform == "unix":
             os.system(("touch %s" % settings_data.searcher_settings))
-        else: os.mknod(settings_data.searcher_settings)
+        else:
+            os.mknod(settings_data.searcher_settings)
         settings_data.createdefaults(platform)
 
     hou.session.SETTINGS = settings_data.loadsettings()
diff --git a/houdini/python27/sqlite3.tar.gz b/houdini/python27/sqlite3.tar.gz
deleted file mode 100644
index af34d63..0000000
Binary files a/houdini/python27/sqlite3.tar.gz and /dev/null differ
diff --git a/python2.7libs/searcher/.vscode/settings.json b/python2.7libs/searcher/.vscode/settings.json
index 5ab3a82..e657cfe 100644
--- a/python2.7libs/searcher/.vscode/settings.json
+++ b/python2.7libs/searcher/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "python.pythonPath": "e:\\GitHub\\Searcher\\scripts\\python\\searcher\\venv\\Scripts\\python.exe",
+    "python.pythonPath": "C:\\Python27\\python.exe",
     "python.formatting.provider": "autopep8",
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
diff --git a/python2.7libs/searcher/HelpButton.py b/python2.7libs/searcher/HelpButton.py
index 0b281d9..867c967 100644
--- a/python2.7libs/searcher/HelpButton.py
+++ b/python2.7libs/searcher/HelpButton.py
@@ -11,7 +11,7 @@
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 
diff --git a/python2.7libs/searcher/about.py b/python2.7libs/searcher/about.py
index 3bcbd62..13c91b6 100644
--- a/python2.7libs/searcher/about.py
+++ b/python2.7libs/searcher/about.py
@@ -2,13 +2,11 @@
 from searcher import about_ui
 from searcher import util
 import os
-import sys
 
-import hou
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
@@ -27,7 +25,24 @@ def __init__(self, parent=None):
         self.ui.setupUi(self)
         self.ui.retranslateUi(self)
 
+        self.ui.github.mousePressEvent = self.openGithub
+        self.ui.web.mousePressEvent = self.openWeb
+
         self.installEventFilter(self)
+
+    def initmenu(self):
+        return
+
+    def openGithub(self, event):
+        ghurl = '''https://github.com/instance-id/'''
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(ghurl))
+        self.parentwindow.parentwindow.close()
+
+    def openWeb(self, event):
+        weburl = '''https://instance.id/'''
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(weburl))
+        self.parentwindow.parentwindow.close()
+
     # ------------------------------------------------------------- Events
     # SECTION Events -----------------------------------------------------
     def eventFilter(self, obj, event):
@@ -39,4 +54,4 @@ def eventFilter(self, obj, event):
             if event.key() == QtCore.Qt.Key_Escape:
                 self.parentwindow.closeroutine()
 
-        return QtCore.QObject.eventFilter(self, obj, event)
\ No newline at end of file
+        return QtCore.QObject.eventFilter(self, obj, event)
diff --git a/python2.7libs/searcher/about_ui.py b/python2.7libs/searcher/about_ui.py
index b9800c1..2f232b0 100644
--- a/python2.7libs/searcher/about_ui.py
+++ b/python2.7libs/searcher/about_ui.py
@@ -4,6 +4,7 @@
 scriptpath = os.path.dirname(os.path.realpath(__file__))
 
 
+# noinspection PyAttributeOutsideInit,DuplicatedCode,PyPep8Naming
 class Ui_About(object):
     def setupUi(self, About):
         About.setObjectName("About")
@@ -34,12 +35,14 @@ def setupUi(self, About):
         self.secondrow.setObjectName("secondrow")
         self.web = QtWidgets.QLabel(About)
         self.web.setObjectName("web")
+        # self.web.setOpenExternalLinks(True)
         self.secondrow.addWidget(self.web)
         self.verticalLayout.addLayout(self.secondrow)
         self.headerrow = QtWidgets.QHBoxLayout()
         self.headerrow.setObjectName("headerrow")
         self.github = QtWidgets.QLabel(About)
         self.github.setObjectName("github")
+        # self.github.setOpenExternalLinks(True)
         self.headerrow.addWidget(self.github)
         self.verticalLayout.addLayout(self.headerrow)
         self.horizontalLayout.addLayout(self.verticalLayout)
diff --git a/python2.7libs/searcher/bugreport.py b/python2.7libs/searcher/bugreport.py
index f7ccebc..5aa1ace 100644
--- a/python2.7libs/searcher/bugreport.py
+++ b/python2.7libs/searcher/bugreport.py
@@ -1,19 +1,16 @@
 from __future__ import absolute_import
 from searcher import bugreport_ui
-from searcher import util
 import os
-import sys
-import codecs
 
 import hou
+
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.') + 1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
-    from hutil.Qt import QtUiTools
 
 try:
     pyside = os.environ['HOUDINI_QT_PREFERRED_BINDING']
@@ -23,92 +20,64 @@
     pyside = 'PySide'
 
 if pyside == 'PySide2':
+    # noinspection PyUnresolvedReferences
     from PySide2 import QtWebEngineWidgets
 
 elif pyside == 'PySide':
+    # noinspection PyUnresolvedReferences
     from PySide.QtWebKit import QWebView
+
 reload(bugreport_ui)
 
 scriptpath = os.path.dirname(os.path.realpath(__file__))
 
 
+def submittypeswitch(argument):
+    switcher = {
+        0: "assignees=&labels=bug&template=bug_report.md&title=",
+        1: "assignees=&labels=enhancement&template=feature_request.md&title=",
+        2: "assignees=&labels=&template=general-question.md&title=",
+    }
+    return switcher.get(argument, "nothing")
+
+
 class BugReport(QtWidgets.QWidget):
     """ Searcher Settings and Debug Menu"""
 
     def __init__(self, parent=None):
         super(BugReport, self).__init__(parent=parent)
+        self.priortext = ""
+        self.isediting = True
         self.setParent(parent)
         self.parentwindow = parent
         self.ui = bugreport_ui.Ui_BugReport()
         self.ui.setupUi(self)
         self.ui.retranslateUi(self)
         self._webview = None
-        self.blocker = False
-        self.html_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "bugsubmit.html"))
-        self.base_url = QtCore.QUrl(self.html_path)
         self.installEventFilter(self)
         self.ui.title.installEventFilter(self)
-        
+
     def initmenu(self):
         self.resize(self.width(), self.parentwindow.height() - 300)
-        self._webview  = None
-        self.isediting = True
-        self.html = None
-        self.html_out = ""
-        self.html_str = ""
-        self.priortext = ""
+        self._webview = None
         self.ui.title.setText("")
         self.ui.edittitle_btn.pressed.connect(self.doweb)
 
         self.ui.title.setFocus()
 
-    def edittitle_cb(self):
-        if not self.blocker:
-            self.blocker = True
-            if (hou.ui.displayMessage(
-                    title='Edit Title?',
-                    text='Bug report text will be reset.',
-                    buttons=("Ok", "Cancel")) == 0):
-                self.isediting = True
-                self.enabletitleedit()
-                self.blocker = False
-
-    def enabletitleedit(self):
-        self._webview.hide()
-        self.resize(self.width(), self.parentwindow.height() - 300)
-        self.ui.title.setReadOnly(False)
-        self.ui.edittitle_btn.setText("Set Title")
-        
-    def enablereporttext(self):
-        self.resize(self.width(), self.parentwindow.height() - 50)
-        self.ui.title.setReadOnly(True)
-        self.ui.edittitle_btn.setText("Edit Title")
-
     def doweb(self):
         if self.ui.title.text() == "":
             self.parentwindow.parentwindow.setstatusmsg("Please enter a title for your bug report", "ImportantMessage")
             if hou.isUIAvailable():
                 hou.ui.setStatusMessage(
-                    "Please enter a title for your bug report.", severity=hou.severityType.Warning)        
+                    "Please enter a title for your bug report.", severity=hou.severityType.Warning)
             return
-        
-        if self.isediting: 
-            self.enablereporttext() 
-        else: 
-            self.edittitle_cb()
-            return
-        
-        if self._webview is None:
-            self._webview = QtWebEngineWidgets.QWebEngineView(self.ui.webview)
-            self._webview.setGeometry(QtCore.QRect(-10, 0, self.width(), self.height()))
-
-        self.html = codecs.open(self.html_path, 'r')
-        self.html_str = self.html.read()
-        self.html_out = self.html_str.replace('ISSUE_TITLE', self.ui.title.text())
-        # self._webview.setHtml(self.html_out, self.base_url)
-        self._webview.load(QtCore.QUrl("https://instance.id/searcher/bugsubmit.html"))
-        self._webview.show()
-        self.isediting = False
+
+        submittype = submittypeswitch(self.ui.label_cbox.currentIndex())
+        reporturl = '''https://github.com/instance-id/searcher_addon/issues/new?%s%s''' % (submittype, self.ui.title.text())
+
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(reporturl))
+        self.parentwindow.parentwindow.close()
 
     # ------------------------------------------------------------- Events
     # SECTION Events -----------------------------------------------------
@@ -122,9 +91,9 @@ def eventFilter(self, obj, event):
             if event.key() == QtCore.Qt.Key_Escape:
                 self.parentwindow.closeroutine()
                 return True
-            
+
         if event_type == QtCore.QEvent.Close:
-            self._webview  = None
+            self._webview = None
             self.isediting = True
 
         return QtCore.QObject.eventFilter(self, obj, event)
diff --git a/python2.7libs/searcher/bugreport_ui.py b/python2.7libs/searcher/bugreport_ui.py
index f7d9b00..c2ec21a 100644
--- a/python2.7libs/searcher/bugreport_ui.py
+++ b/python2.7libs/searcher/bugreport_ui.py
@@ -30,6 +30,21 @@ def setupUi(self, BugReport):
         self.title.setMinimumSize(QtCore.QSize(175, 0))
         self.title.setObjectName("title")
         self.secondrow.addWidget(self.title)
+        self.verticalLayout_4.addLayout(self.secondrow)
+        self.thirdrow = QtWidgets.QHBoxLayout()
+        self.thirdrow.setObjectName("thirdrow")
+        spacerItem1 = QtWidgets.QSpacerItem(40, 25, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.thirdrow.addItem(spacerItem1)
+        self.label_cbox = QtWidgets.QComboBox(BugReport)
+        self.label_cbox.setObjectName("label_cbox")
+        self.label_cbox.setLayoutDirection(QtCore.Qt.LeftToRight)
+        self.label_cbox.setMaximumSize(QtCore.QSize(100, 25))
+        self.label_cbox.addItem("Bug")
+        self.label_cbox.addItem("Suggestion")
+        self.label_cbox.addItem("Question")
+        self.thirdrow.addWidget(self.label_cbox)
+        spacerItem1 = QtWidgets.QSpacerItem(5, 30, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        self.thirdrow.addItem(spacerItem1)
         self.edittitle_btn = QtWidgets.QPushButton(BugReport)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -38,16 +53,9 @@ def setupUi(self, BugReport):
         self.edittitle_btn.setSizePolicy(sizePolicy)
         self.edittitle_btn.setMaximumSize(QtCore.QSize(75, 16777215))
         self.edittitle_btn.setObjectName("edittitle")
-        self.secondrow.addWidget(self.edittitle_btn)
-        self.verticalLayout_4.addLayout(self.secondrow)
-        self.webview = QtWidgets.QLabel(BugReport)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.webview.sizePolicy().hasHeightForWidth())
-        self.webview.setSizePolicy(sizePolicy)
-        self.webview.setObjectName("webview")
-        self.verticalLayout_4.addWidget(self.webview)
+        self.thirdrow.addWidget(self.edittitle_btn)
+        
+        self.verticalLayout_4.addLayout(self.thirdrow)
         self.gridLayout.addLayout(self.verticalLayout_4, 0, 0, 1, 1)
         
         self.retranslateUi(BugReport)
@@ -56,6 +64,6 @@ def setupUi(self, BugReport):
     def retranslateUi(self, BugReport):
         _translate = QtCore.QCoreApplication.translate
         BugReport.setWindowTitle(_translate("BugReport", "Form"))
-        self.edittitle_btn.setText(_translate("BugReport", "Set Title"))
+        self.edittitle_btn.setText(_translate("BugReport", "Create"))
         self.title.setPlaceholderText(_translate("BugReport", "Please enter descriptive bug report title:"))
         # self.continue_btn.setText(_translate("BugReport", "Continue"))
diff --git a/python2.7libs/searcher/bugsubmit.html b/python2.7libs/searcher/bugsubmit.html
index 7c6d2c2..d01f5d7 100644
--- a/python2.7libs/searcher/bugsubmit.html
+++ b/python2.7libs/searcher/bugsubmit.html
@@ -10,7 +10,7 @@
 
 <style type="text/css">.utterances { margin-top: -50px; padding-top: -10px; margin-bottom: 0px }</style>
 <script src="https://utteranc.es/client.js"
-  repo="instance-id/instance-id.github.io"
+  repo="instance-id/searcher_addon"
   issue-term="title"
   theme="github-dark"
   crossorigin="anonymous"
diff --git a/python2.7libs/searcher/debugutils.py b/python2.7libs/searcher/debugutils.py
index 1179ed1..a5bab8a 100644
--- a/python2.7libs/searcher/debugutils.py
+++ b/python2.7libs/searcher/debugutils.py
@@ -1,5 +1,6 @@
 from __future__ import print_function
 from __future__ import division
+
 from builtins import range
 from past.utils import old_div
 from hutil.Qt import QtCore
@@ -30,7 +31,7 @@ def dumpWidgetLayout(widget, prefix=''):
         text += str((prefix, "  layout.contentsMargins:", str(widget.layout().contentsMargins())))
         for i in range(0, layout.count()):
             item = layout.itemAt(i)
-            dir_flag = item.expandingDirections() 
+            dir_flag = item.expandingDirections()
             if (dir_flag & QtCore.Qt.Orientation.Horizontal):
                text += str((prefix, "  -> ", i, ": expand HORIZ"))
             elif (dir_flag & QtCore.Qt.Orientation.Vertical):
@@ -43,5 +44,5 @@ def dumpWidgetLayout(widget, prefix=''):
     text += str((prefix, "  numChildren:", len(widget.children())))
     for child in widget.children():
         dumpWidgetLayout(child, prefix + '  ')
-    
-    return text
\ No newline at end of file
+
+    return text
diff --git a/python2.7libs/searcher/language_en.py b/python2.7libs/searcher/language_en.py
index 39a54e6..6c49b7b 100644
--- a/python2.7libs/searcher/language_en.py
+++ b/python2.7libs/searcher/language_en.py
@@ -2,68 +2,68 @@
 language = "en"
 
 
-
 # NOTE  Tooltips
-TT_MW = {   
-    "searchbox" :               "Begin typing to search or click magnifying glass icon to display options",
-    "contexttoggle" :           "Toggle to enable or disable the 'context' column in the search results",
-    "pinwindow" :               "Pin the search window to keep it from closing automatically when losing focus",
-    "searchfilter" :            "Select a predefined filter",
-    "opensettingstool" :        "General application settings",
-    "searchresultstree" :       "Press tab to highlight or double click an action to attempt to perform it. Some actions only work in specific contexts",
-    "helpButton" :              "Open help panel",
-    "metricposmain" :           "Change the position of metrics to Houdinis main window",
-    "metricposself" :           "Change the position of metrics to Searchers window",
-    "expand_all" :              "Expand all tree items",
-    "collapse_all" :            "Collapse all tree items",
-}   
-# NOTE Tooltops Settings    
-TT_SETTINGS = { 
+TT_MW = {
+    "searchbox":                "Begin typing to search or click magnifying glass icon to display options",
+    "contexttoggle":            "Toggle to enable or disable the 'context' column in the search results",
+    "pinwindow":                "Pin the search window to keep it from closing automatically when losing focus",
+    "searchfilter":             "Select a predefined filter",
+    "opensettingstool":         "General application settings",
+    "searchresultstree":        "Press tab to highlight or double click an action to attempt to perform it. Some actions only work in specific contexts",
+    "helpButton":               "Open help panel",
+    "metricposmain":            "Change the position of metrics to Houdinis main window",
+    "metricposself":            "Change the position of metrics to Searchers window",
+    "expand_all":               "Expand all tree items",
+    "collapse_all":             "Collapse all tree items",
+}
+
+# NOTE Tooltops Settings
+TT_SETTINGS = {
     "about":                    "Contact and other info",
-    "projectTitle" :            "Thanks for using Searcher!",
-    "lang_cbox" :               "When translations become available they can be selected here",
-    "inmemory_chk" :            "Enable to use an in-memory database instead of SQLite file",
-    "windowsize_chk" :          "Enable to save the size and location of the main window upon closing. Defaults to center (1000px, 600px)",
-    "maxresults_lbl" :          "Maximum results to load per query as you type your search term. (Too many can make results feel sluggish)",
-    "maxresults_txt" :          "Maximum results to load per query as you type your search term  (Too many can make results feel sluggish)",
-    "animatedsettings_chk" :    "Enables animated menus",
-    "dbpath_icon": "",  
-    "dbpath_lbl" :              "The location in which Searcher stores it's database file",
-    "databasepath_txt" :        "The location in which Searcher stores it's database file",
-    "defaulthotkey_lbl" :       "Key used to trigger unbound actions",
-    "defaulthotkey_txt" :       "Key used to trigger unbound actions",
-    "cleardata_btn" :           "If, for some reason, Searcher is having issues this function will clear out the database and start fresh",
-    "save_btn" :                "Save your settings",
-    "discard_btn" :             "Disgard settings changes",
+    "projectTitle":             "Thanks for using Searcher!",
+    "lang_cbox":                "When translations become available they can be selected here",
+    "inmemory_chk":             "Enable to use an in-memory database instead of SQLite file",
+    "windowsize_chk":           "Enable to save the size and location of the main window upon closing. Defaults to center (1000px, 600px)",
+    "maxresults_lbl":           "Maximum results to load per query as you type your search term. (Too many can make results feel sluggish)",
+    "maxresults_txt":           "Maximum results to load per query as you type your search term  (Too many can make results feel sluggish)",
+    "animatedsettings_chk":     "Enables animated menus",
+    "dbpath_icon":              "Select the location to store the Searcher database",
+    "dbpath_lbl":               "The location in which Searcher stores it's database file",
+    "databasepath_txt":         "The location in which Searcher stores it's database file",
+    "defaulthotkey_lbl":        "Key used to trigger unbound actions",
+    "defaulthotkey_txt":        "Key used to trigger unbound actions",
+    "cleardata_btn":            "If, for some reason, Searcher is having issues this function will clear out the database and start fresh",
+    "save_btn":                 "Save your settings",
+    "discard_btn":              "Disgard settings changes",
     "debugflag_chk":            "Toggle debug messages",
-    "debuglevel_cbx":           "Select level of debugging", 
-    "bugreport":                "Bug report form", 
-    "theme":                    "Change colors", 
-    "metrics_chk":              "Enable performance metrics to view query and render times", 
+    "debuglevel_cbx":           "Select level of debugging",
+    "bugreport":                "Bug report form",
+    "theme":                    "Change colors",
+    "metrics_chk":              "Enable performance metrics to view query and render times",
 }
 
-# NOTE database - General Errors  
+# NOTE database - General Errors
 DBERRORMSG = {
-    "cleardatabase" :           "Could not clear db for refresh: ",
-    "updatecontext" :           "Could not update Searcher context database: ",
-    "updatechangeindex" :       "Could not update Searcher context database: ",
-    "getlastusedhk1" :          "Could not query last assigned temp hotkey: ",
-    "getlastusedhk2" :          "Could not clear last assigned temp hotkey: ",
-    "getlastusedh3" :           "Could not clear last assigned temp hotkey on last attempt: ",
-    "getchangeindex" :          "Could not get Searcher changeindex: ",
+    "cleardatabase":            "Could not clear db for refresh: ",
+    "updatecontext":            "Could not update Searcher context database: ",
+    "updatechangeindex":        "Could not update Searcher context database: ",
+    "getlastusedhk1":           "Could not query last assigned temp hotkey: ",
+    "getlastusedhk2":           "Could not clear last assigned temp hotkey: ",
+    "getlastusedh3":            "Could not clear last assigned temp hotkey on last attempt: ",
+    "getchangeindex":           "Could not get Searcher changeindex: ",
 }
 
 # NOTE 456 - Initial setup
 MESSAGES = {
-    "initialsetup1" :           "Searcher database created",
-    "initialsetup2" :           "Searcher database created and populated",
-    "createdefaults" :          "Searcher database created and populated",
+    "initialsetup1":            "Searcher database created",
+    "initialsetup2":            "Searcher database created and populated",
+    "createdefaults":           "Searcher database created and populated",
 }
 
 # NOTE settings_data - Save/Load
 SETTINGSMESSAGES = {
-    "savesettings" :            "Could not save settings: ",
-    "loadsettings" :            "Could not load settings: ",
+    "savesettings":             "Could not save settings: ",
+    "loadsettings":             "Could not load settings: ",
 }
 
 # !SECTION
diff --git a/python2.7libs/searcher/platformselect.py b/python2.7libs/searcher/platformselect.py
index 84e5e1f..b949bae 100644
--- a/python2.7libs/searcher/platformselect.py
+++ b/python2.7libs/searcher/platformselect.py
@@ -22,10 +22,10 @@ def get_platform():
     return PLATFORM
 
 def get_sqlite():
-    if  get_platform() == "Windows":
+    if get_platform() == "Windows":
         path_sqlite_dll = os.path.join(SEARCHER_PATH, 'python27/dlls/sqlite3.dll')
         ctypes.cdll.LoadLibrary(path_sqlite_dll)
-    elif  get_platform() == "Darwin":
+    elif get_platform() == "Darwin":
         path_sqlite_dll = os.path.join(SEARCHER_PATH, 'python27/dlls/sqlite3.dll')
     else:
-        path_sqlite_dll = os.path.join(SEARCHER_PATH, 'python27/dlls/sqlite3.dll')
\ No newline at end of file
+        path_sqlite_dll = os.path.join(SEARCHER_PATH, 'python27/dlls/sqlite3.dll')
diff --git a/python2.7libs/searcher/searcher.py b/python2.7libs/searcher/searcher.py
index cb4d0f1..2fc58c6 100644
--- a/python2.7libs/searcher/searcher.py
+++ b/python2.7libs/searcher/searcher.py
@@ -29,14 +29,14 @@
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 else:
-    from PyQt5 import QtGui
-    from PyQt5 import QtCore
-    from PyQt5 import QtWidgets
+    from qtpy import QtGui
+    from qtpy import QtCore
+    from qtpy import QtWidgets
 
 reload(searcher_settings_ui)
 reload(searcher_settings)
@@ -74,26 +74,32 @@
 
 parent_widget = hou.qt.mainWindow()
 
+
 # ----------------------------------------------- Functions
 # NOTE Functions ------------------------------------------
 def get_settings():
     return getattr(hou.session, "SETTINGS", None)
 
+
 def get_dbhandler():
     return getattr(hou.session, "DBHANDLER", None)
 
+
 def keyconversion(key):
     for i in range(len(key)):
         if key[i] in util.KEYCONVERSIONS:
             key[i] = util.KEYCONVERSIONS[key[i]]
     return key
 
+
 # !SECTION Globals
 
 # --------------------------------------------------------- Searcher Class
 # SECTION Searcher Class -------------------------------------------------
+# noinspection PyUnresolvedReferences
 class Searcher(QtWidgets.QWidget):
     """instance.id Searcher for Houdini"""
+
     # --------------------------------------------------------- Class init
     # SECTION Class init -------------------------------------------------
     def __init__(self, settings, windowsettings, animated, kwargs):
@@ -194,7 +200,7 @@ def __init__(self, settings, windowsettings, animated, kwargs):
     # !SECTION Class init
 
     def getwidgets(self):
-        import debugutils as dbug
+        from searcher import debugutils as dbug
         reload(dbug)
         data = ""
 
@@ -202,18 +208,17 @@ def getwidgets(self):
             data += ("Shelf name: %s -------------------------- \n" % shelf)
             for tool in shelf.tools():
                 data += ("Tool name: %s \n" % tool.name())
-                data +=  ("Tool label: %s \n" % tool.label())
-                data +=  ("Tool keywords: %s \n" % tool.script())
+                data += ("Tool label: %s \n" % tool.label())
+                data += ("Tool keywords: %s \n" % tool.script())
                 # data +=  ("Tool toolMenuLocations: %s \n" % tool.toolMenuOpType())
 
-
-        outputpath =  os.path.join(
+        outputpath = os.path.join(
             hou.homeHoudiniDirectory(), 'Searcher', "output.json"
         )
         # info = hou.ui.viewerStateInfo()
-        sample = open(outputpath, 'w') 
-        print(data, file = sample) 
-        sample.close() 
+        sample = open(outputpath, 'w')
+        print(data, file=sample)
+        sample.close()
         # print(info)
 
         # shelfkeys = hou.shelves.tools().keys()
@@ -227,10 +232,9 @@ def getwidgets(self):
         #         tools = tools[shelfkeys[t]]
         #         print("Tool data: %s" % tool[t])
 
-            
-            # toolkeys = tool.keys()
-            # print("Tool keys: %s" % toolkeys)
-            # print(shelfkeys[i])
+        # toolkeys = tool.keys()
+        # print("Tool keys: %s" % toolkeys)
+        # print(shelfkeys[i])
 
         # runningtool = hou.shelves.runningTool()
         # print(runningtool)
@@ -239,30 +243,26 @@ def getwidgets(self):
         if "editor" in self.kwargs:
             print(self.kwargs["editor"].pwd())
 
-
         # print(hou.shelves.tools().keys())
 
         pos = QtGui.QCursor.pos()
         if self.isdebug and self.isdebug.level in {"ALL"}:
             print("Position: X:%d Y: %d" % (pos.x(), pos.y()))
-            
+
         mainwin = QtWidgets.QApplication
         undermouse = util.widgets_at(mainwin, pos)
 
         widgetdata = ""
-        outputpath2 =  os.path.join(
+        outputpath2 = os.path.join(
             hou.homeHoudiniDirectory(), 'Searcher', "widgets.json"
         )
-        sample2 = open(outputpath2, 'w') 
+        sample2 = open(outputpath2, 'w')
         for w in undermouse:
-            print(dbug.dumpWidgetLayout(w, "_____"), file = sample2) 
+            print(dbug.dumpWidgetLayout(w, "_____"), file=sample2)
             if w.windowTitle() != "":
                 print("Title: %s" % w.windowTitle())
 
-
-        
-        sample2.close() 
-
+        sample2.close()
 
         # allWidgets = QtWidgets.QApplication.allWidgets()
         # for w in allWidgets:
@@ -273,9 +273,9 @@ def getwidgets(self):
         #     hou.homeHoudiniDirectory(), 'Searcher', "output.json"
         # )
         # info = hou.ui.viewerStateInfo()
-        # sample = open(outputpath, 'w') 
-        # print(info, file = sample) 
-        # sample.close() 
+        # sample = open(outputpath, 'w')
+        # print(info, file = sample)
+        # sample.close()
         # print(info)
 
     # ------------------------------------------------------ Settings Menu
@@ -284,7 +284,7 @@ def getwidgets(self):
     # NOTE buildsettingsmenu ------------------------------
     def buildsettingsmenu(self):
         self.ui.setWindowFlags(
-            QtCore.Qt.Tool 
+            QtCore.Qt.Tool
             | QtCore.Qt.CustomizeWindowHint
             | QtCore.Qt.FramelessWindowHint
         )
@@ -493,7 +493,7 @@ def openmenu(self):
         self.searchmenu.setStyleSheet(style.MENUSTYLE)
         self.searchmenu.setWindowFlags(
             self.searchmenu.windowFlags() |
-            QtCore.Qt.NoDropShadowWindowHint | 
+            QtCore.Qt.NoDropShadowWindowHint |
             QtCore.Qt.X11BypassWindowManagerHint
         )
         self.globalprefix = self.searchmenu.addAction("Global items")
@@ -538,9 +538,10 @@ def setstatusmsg(self, msg, severity):
         if self.isdebug.mainwindow:
             if hou.isUIAvailable():
                 hou.ui.setStatusMessage(
-                    (str(styledmsg)), severity=severitytype)
-            else: print(str(msg))
-        else: 
+                    message=(str(msg)), severity=severity)
+            else:
+                print(str(msg))
+        else:
             styledmsg, severitytype = style.setstatusmsg(msg, severity)
             self.setinfotext(200, styledmsg, True)
 
@@ -557,7 +558,7 @@ def setinfotext(self, duration, text, status=False):
     def count_chars(self, txt):
         result = 0
         for char in txt:
-            result += 1     # same as result = result + 1
+            result += 1  # same as result = result + 1
         return result
 
     # --------------------------------------- Initial Setup
@@ -709,7 +710,7 @@ def opensettings_cb(self, doopen):
     def open_settings(self, doopen):
         if doopen:
             pos = self.opensettingstool.mapToGlobal(
-                    QtCore.QPoint(-self.ui.width() + 31, 28))
+                QtCore.QPoint(-self.ui.width() + 31, 28))
             self.ui.setGeometry(
                 pos.x(),
                 pos.y(),
@@ -745,7 +746,7 @@ def anim_complete(self):
     # --------------------------------------- textchange_cb
     # NOTE textchange_cb ----------------------------------
     def textchange_cb(self, text):
-        self.starttime = ptime.time() # -----------------------------   # ANCHOR Search Timer Start
+        self.starttime = ptime.time()  # -----------------------------   # ANCHOR Search Timer Start
         if len(text) > 0 and not self.holdinfobanner:
             self.setinfotext(200, self.searchresultstree.toolTip())
         if text in util.CTXSHOTCUTS:
@@ -756,7 +757,7 @@ def textchange_cb(self, text):
             text = re.sub(allowed, '', text)
             str = text.split()
             searchstring = ['%s*' % (x,) for x in str]
-            regtime = ptime.time()    # -----------------------------   # ANCHOR Regex Timer Start
+            regtime = ptime.time()  # -----------------------------   # ANCHOR Regex Timer Start
             self.regtimetotal = ((regtime - self.starttime) * 1000.0)
             if searchstring:
                 if self.isdebug and self.isdebug.level in {"ALL"}:
@@ -835,9 +836,9 @@ def processkey(self, key, tmphk=False):
         if tmphk:
             self.savelastkey(self.tmpsymbol, key)
 
-        if(key[0] is not '+'):
+        if (key[0] is not '+'):
             key = key[0].split('+')
-                    
+
         skey = None
         ikey = None
         key = keyconversion(key)
@@ -852,9 +853,9 @@ def processkey(self, key, tmphk=False):
 
         keypress = QtGui.QKeyEvent(
             QtGui.QKeyEvent.KeyPress,  # Keypress event identifier
-            ikey,                      # Qt key identifier
-            mod_flag,                  # Qt key modifier
-            skey                       # String of Qt key identifier
+            ikey,  # Qt key identifier
+            mod_flag,  # Qt key modifier
+            skey  # String of Qt key identifier
         )
 
         focustarget = self.getpane if self.getpane else hou.ui.mainQtWindow()
@@ -862,9 +863,15 @@ def processkey(self, key, tmphk=False):
             for pane_tab in hou.ui.curDesktop().paneTabs():
                 if pane_tab.name() == focustarget.name():
                     pane_tab.setIsCurrentTab()
-        hou.ui.mainQtWindow().setFocus()
+
         try:
-            hd.executeDeferred(self.app.sendEvent, hou.ui.mainQtWindow(), keypress)
+            if sys.platform == "darwin":
+                hou.qt.mainWindow().setFocus()
+                hd.executeDeferredAfterWaiting(self.app.sendEvent, 5, hou.qt.mainWindow(), keypress)
+            else:
+                hou.qt.mainWindow().setFocus()
+                hd.executeDeferred(self.app.sendEvent, hou.qt.mainWindow(), keypress)
+            # event = QtWidgets.QApplication.postEvent(hou.ui.mainQtWindow(), keypress)
             self.close()
 
         except(AttributeError, TypeError) as e:
@@ -923,7 +930,7 @@ def removetemphotkey(self, symbol, tmpkey):
     # SECTION Search -----------------------------------------------------
     # ---------------------------------- createcontextitems
     # TODO createcontextitems -----------------------------
-    def createcontextitems(self, result):
+    def createcontextitems(self, result, hc):
         result[2] = (QtWidgets.QTreeWidgetItem(self.searchresultstree, [result[hc][0], result[hc][1]]))
 
     # -------------------------------------------- openmenu
@@ -932,12 +939,11 @@ def appendcontextlist(self, list):
         if list[4] not in self.context_list:
             return self.context_list.append(list[4])
 
-   # ------------------------------------- globalkeysearch
+    # ------------------------------------- globalkeysearch
     # NOTE globalkeysearch --------------------------------
     def globalkeysearch(self):
         self.ctxsearch = True
-        ctx = []
-        ctx.append("h")
+        ctx = ["h"]
         results = self.handler.searchctx(ctx)
         self.searchtablepopulate(results)
         self.ctxsearch = False
@@ -945,14 +951,15 @@ def globalkeysearch(self):
     def processdesktop(self, ran, result):
         print("---- %s" % ran)
         print(result)
-        print("Window Name: %s | Whats This?: %s | Type: %s" % (result.windowTitle(), result.whatsThis(), result.accessibleName()))
+        print("Window Name: %s | Whats This?: %s | Type: %s" % (
+            result.windowTitle(), result.whatsThis(), result.accessibleName()))
         if isinstance(result, Iterable):
             print("Item amount: %d" % len(result))
             try:
                 for i in result:
                     print(i.windowTitle())
                     if ran == "hou.ui.paneTabs()":
-                        print("Name : %s | Item: %s | Type: %s" % (i.name(), i, i.type))     
+                        print("Name : %s | Item: %s | Type: %s" % (i.name(), i, i.type))
                     elif ran == "util.widgets_at(mainwin, pos)":
                         print("Window Name: %s | Item: %s | Type: %s" % (i.windowTitle(), i.type, i.type))
                     else:
@@ -994,7 +1001,8 @@ def ctxsearcher(self, ctx=None):
                     for i in selected_node[0].parmTuples():
                         print(i)
                     skipelse = True
-                else: pass
+                else:
+                    pass
             except(AttributeError, TypeError) as e:
                 self.setstatusmsg(str(e), "Warning")
 
@@ -1010,7 +1018,8 @@ def ctxsearcher(self, ctx=None):
                         self.searchbox.setText(":c %s" % ctxresult[1])
                         self.searchbox.blockSignals(False)
                         skipelse = True
-                    else: pass
+                    else:
+                        pass
                 except(AttributeError, TypeError) as e:
                     self.setstatusmsg(str(e), "Warning")
 
@@ -1024,7 +1033,8 @@ def ctxsearcher(self, ctx=None):
                     if undermouse:
                         for w in undermouse:
                             if w.windowTitle() != "":
-                                ctxresult = util.PANETYPES.get(w.windowTitle()) if w.windowTitle() in util.PANETYPES else None
+                                ctxresult = util.PANETYPES.get(
+                                    w.windowTitle()) if w.windowTitle() in util.PANETYPES else None
                                 if ctxresult is not None:
                                     if self.isdebug and self.isdebug.level in {"ALL"}:
                                         print("Title: %s HContext: %s" % (ctxresult[0], ctxresult[1]))
@@ -1090,7 +1100,7 @@ def searchtablepopulate(self, data):
                     self.context_list.append(data[i][4])
                     # if self.ctxsearch:
                     # else:
-                        # self.context_list.append(data[i][4])
+                    # self.context_list.append(data[i][4])
 
             result, hctimer = self.handler.gethcontextod(self.context_list)
             self.hcontexttime = hctimer
@@ -1137,7 +1147,7 @@ def searchtablepopulate(self, data):
             # self.searchevent.stop() # ANCHOR hou perf timer ---------------------------------------- hou perf timer
             # self.timerprofile.stop() # ANCHOR hou perf timer ---------------------------------------- hou perf timer
 
-            treebuildtimerend = ptime.time() # --------------------------- # ANCHOR Tree Builder End
+            treebuildtimerend = ptime.time()  # --------------------------- # ANCHOR Tree Builder End
             treebuildtotal = ((treebuildtimerend - treebuildtimer) * 1000.0)
 
             if not self.holdinfobanner:
@@ -1150,7 +1160,7 @@ def searchtablepopulate(self, data):
                         print(e)
 
             self.styleresultstotalasync(self.treecatnum, self.treeitemsnum)
-            self.endtime = ptime.time() # -----------------------------         # ANCHOR Search Timer End
+            self.endtime = ptime.time()  # -----------------------------         # ANCHOR Search Timer End
             totaltime = ((self.endtime - self.starttime) * 1000.0)
             if self.isdebug.performance:
                 outdata = [self.regtimetotal, self.hcontexttime, self.hotkeystime, treebuildtotal, totaltime]
@@ -1197,6 +1207,7 @@ def styletimers(self, d1):
             perftime = style.styletimers(d1)
             self.infolbl.setStyleSheet(style.INFOLABEL)
             self.infolbl.setText(perftime)
+
     # !SECTION styletimers
 
     # ---------------------------------- styleresultstotalasync
@@ -1211,6 +1222,7 @@ def styleresultstotalasync(self, d1, d2):
     def styletotals(self, d1, d2):
         result = style.styleresulttotal(d1, d2)
         self.treetotal_lbl.setText(result)
+
     # !SECTION styleresultstotal
 
     # --------------------------------------infolabeldelayasync
@@ -1238,6 +1250,7 @@ def infolabeldelay(self):
         else:
             pass
         # print(self.timerprofile.stats()) # ANCHOR hou perf timer ---------------------------------------- hou perf timer
+
     # !SECTION infolabeldelay
 
     # --------------------------------------------- createtimer
@@ -1247,7 +1260,7 @@ def createtimer(self, time, func, p):
             if self.tiptimer.isAlive():
                 self.tiptimer.cancel()
 
-        self.tiptimer = threading.Timer(time,(func(p)))
+        self.tiptimer = threading.Timer(time, (func(p)))
         self.tiptimer.start()
 
     # !SECTION Async Methods
@@ -1345,13 +1358,12 @@ def checktooltip(self, obj, hasleft=False):
             elif self.infolbl.text() != obj.toolTip():
                 self.setinfotext(200, obj.toolTip())
 
-
     # ---------------------------------------- addshortcuts
     # NOTE addshortcuts -----------------------------------
     def addshortcuts(self):
         toggleexpand_shct = QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+W"), self)
         toggleexpand_shct.activated.connect(self.expander_cb)
-        
+
         opensettings_shct = QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+S"), self)
         opensettings_shct.activated.connect(self.opensettingstool.click)
 
@@ -1360,13 +1372,12 @@ def addshortcuts(self):
 
         getpanes_shct = QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+Tab"), self)
         getpanes_shct.activated.connect(self.ctxhotkey_cb)
-    
+
     # -------------------------------------------------------- Event Types
     # SECTION Event Types ------------------------------------------------
     # def createEventHandler(self, uievent, pending_actions):
     #     if isinstance(uievent, MouseEvent):
     def onFocusWindowChanged(self, focusWindow):
-        print("Focus Changed!")
         if focusWindow is None:
             print("None!")
 
@@ -1390,8 +1401,6 @@ def onMouseEvent(self, kwargs):
         elif reason == hou.uiEventReason.Changed:
             print("LMB was released")
 
-
-
     def eventFilter(self, obj, event):
         event_type = event.type()
 
@@ -1480,6 +1489,14 @@ def eventFilter(self, obj, event):
         # ---------------------------------------- Keypress
         # NOTE Keypress -----------------------------------
         if event_type == QtCore.QEvent.KeyPress:
+            # # ----------------------------- Enter
+            # # NOTE Enter ------------------------
+            # if event.key() in (QtCore.Qt.Key_Return, QtCore.Qt.Key_Enter):
+            #     print('Enter:')
+            #     enter_event = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Enter, QtCore.Qt.NoModifier)
+            #     QtWidgets.QApplication.postEvent(self, enter_event)
+            #     return True
+
             # ------------------------------- TAB
             # NOTE TAB --------------------------
             if event.key() == QtCore.Qt.Key_Tab:
@@ -1506,8 +1523,10 @@ def eventFilter(self, obj, event):
                             return True
                         else:
                             self.menuopened = False
+                            return True
                     else:
                         self.close()
+                        return True
 
             # ------------------------------- ":"
             # NOTE ":" --------------------------
@@ -1558,7 +1577,8 @@ def eventFilter(self, obj, event):
                     self.windowsettings.setValue("geometry", self.saveGeometry())
             except (AttributeError, TypeError) as e:
                 if hou.isUIAvailable():
-                    hou.ui.setStatusMessage(("Could not save window dimensions: " + str(e)), severity=hou.severityType.Warning)
+                    hou.ui.setStatusMessage(("Could not save window dimensions: " + str(e)),
+                                            severity=hou.severityType.Warning)
                 else:
                     print("Could not save window dimensions: " + str(e))
 
@@ -1566,8 +1586,9 @@ def eventFilter(self, obj, event):
                 self.searchmenu.setVisible(False)
 
             if self.tmpsymbol is not None:
-                hd.executeDeferred(
+                hd.executeDeferredAfterWaiting(
                     self.removetemphotkey,
+                    25,
                     self.tmpsymbol,
                     self.tmpkey)
 
@@ -1590,6 +1611,7 @@ def eventFilter(self, obj, event):
     # !SECTION Events
     # !SECTION Searcher Class
 
+
 # -------------------------------------------------------------- Setup
 # SECTION Setup ------------------------------------------------------
 # ----------------------------------- Center Window
@@ -1602,6 +1624,7 @@ def center():
         )
     )
 
+
 # ----------------------------------- Create Window
 # NOTE Create Window ------------------------------
 def CreateSearcherPanel(searcher_window=None, **kwargs):
@@ -1619,9 +1642,9 @@ def CreateSearcherPanel(searcher_window=None, **kwargs):
     searcher_window.setAttribute(QtCore.Qt.WA_StyledBackground, True)
     searcher_window.setWindowFlags(
         QtCore.Qt.Tool
-      | QtCore.Qt.CustomizeWindowHint
-      | QtCore.Qt.FramelessWindowHint
-      | QtCore.Qt.WindowStaysOnTopHint
+        | QtCore.Qt.CustomizeWindowHint
+        | QtCore.Qt.FramelessWindowHint
+        | QtCore.Qt.WindowStaysOnTopHint
     )
 
     if util.bc(settings[util.SETTINGS_KEYS[2]]) and windowsettings.value("geometry") is not None:
@@ -1653,6 +1676,7 @@ def CreateSearcherPanel(searcher_window=None, **kwargs):
 
     # searcher_window.activateWindow()
 
+
 # !SECTION Setup
 
 
diff --git a/python2.7libs/searcher/searcher_settings.py b/python2.7libs/searcher/searcher_settings.py
index 382ed5b..491b63b 100644
--- a/python2.7libs/searcher/searcher_settings.py
+++ b/python2.7libs/searcher/searcher_settings.py
@@ -17,17 +17,18 @@
 import os
 
 import hou
+
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.') + 1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 else:
-    from PyQt5 import QtGui
-    from PyQt5 import QtCore
-    from PyQt5 import QtWidgets
+    from qtpy import QtGui
+    from qtpy import QtCore
+    from qtpy import QtWidgets
 
 reload(about)
 reload(theme)
@@ -43,14 +44,17 @@
 def get_settings():
     return getattr(hou.session, "SETTINGS", None)
 
+
 the_scaled_icon_size = hou.ui.scaledSize(16)
 the_icon_size = 16
 
 scriptpath = os.path.dirname(os.path.realpath(__file__))
 
+
 def bc(v):
     return str(v).lower() in ("yes", "true", "t", "1")
 
+
 class SearcherSettings(QtWidgets.QWidget):
     """ Searcher Settings and Debug Menu"""
 
@@ -92,7 +96,7 @@ def __init__(self, handler, width, height, parent=None):
         self.setBackgroundRole(QtGui.QPalette.Window)
         self.settings = get_settings()
         self.isdebug = util.Dbug(
-            self.settings[util.SETTINGS_KEYS[4]], 
+            self.settings[util.SETTINGS_KEYS[4]],
             str(self.settings[util.SETTINGS_KEYS[10]]),
             self.settings[util.SETTINGS_KEYS[12]],
             self.settings[util.SETTINGS_KEYS[13]],
@@ -107,8 +111,8 @@ def __init__(self, handler, width, height, parent=None):
         self.about = about.About(self)
         self.about.setAttribute(QtCore.Qt.WA_StyledBackground, True)
         self.about.setWindowFlags(
-            QtCore.Qt.Tool 
-            | QtCore.Qt.FramelessWindowHint 
+            QtCore.Qt.Tool
+            | QtCore.Qt.FramelessWindowHint
             | QtCore.Qt.CustomizeWindowHint
         )
         self.about.resize(width, height - 180)
@@ -116,8 +120,8 @@ def __init__(self, handler, width, height, parent=None):
         self.bugreport = bugreport.BugReport(self)
         self.bugreport.setAttribute(QtCore.Qt.WA_StyledBackground, True)
         self.bugreport.setWindowFlags(
-            QtCore.Qt.Tool 
-            | QtCore.Qt.FramelessWindowHint 
+            QtCore.Qt.Tool
+            | QtCore.Qt.FramelessWindowHint
             | QtCore.Qt.CustomizeWindowHint
         )
         self.bugreport.resize(width, height - 300)
@@ -149,17 +153,18 @@ def __init__(self, handler, width, height, parent=None):
         self.maxresults.setToolTip(la.TT_SETTINGS[self.maxresults.objectName()])
         self.animatedsettings = self.ui.animatedsettings_chk
         self.animatedsettings.setToolTip(la.TT_SETTINGS[self.animatedsettings.objectName()])
-        
+
         # thirdrow
         self.ui.defaulthotkey_lbl.setToolTip(la.TT_SETTINGS[self.ui.defaulthotkey_lbl.objectName()])
         self.defaulthotkey = self.ui.defaulthotkey_txt
         self.defaulthotkey.setToolTip(la.TT_SETTINGS[self.defaulthotkey.objectName()])
-        
+
         # fourthrow
         self.ui.dbpath_lbl.setToolTip(la.TT_SETTINGS[self.ui.dbpath_lbl.objectName()])
         self.database_path = self.ui.databasepath_txt
         self.database_path.setToolTip(la.TT_SETTINGS[self.database_path.objectName()])
-        self.dbpath_btn = self.ui.dbpath_icon 
+        self.dbpath_btn = self.ui.dbpath_icon
+        self.dbpath_btn.setToolTip(la.TT_SETTINGS[self.dbpath_btn.objectName()])
         dbpath_button_size = hou.ui.scaledSize(16)
         self.dbpath_btn.setProperty("flat", True)
         self.dbpath_btn.setIcon(util.FILE_ICON)
@@ -172,8 +177,8 @@ def __init__(self, handler, width, height, parent=None):
         self.metrics = self.ui.metrics_chk
         self.metrics.setVisible(bc(self.settings[util.SETTINGS_KEYS[4]]))
         self.metrics.setToolTip(la.TT_SETTINGS[self.metrics.objectName()])
-        self.cleardata = self.ui.cleardata_btn
-        self.cleardata.setToolTip(la.TT_SETTINGS[self.cleardata.objectName()])
+        # self.cleardata = self.ui.cleardata_btn
+        # self.cleardata.setToolTip(la.TT_SETTINGS[self.cleardata.objectName()])
 
         # sixthrow
         self.aboutbtn = self.ui.about_btn
@@ -223,7 +228,7 @@ def __init__(self, handler, width, height, parent=None):
 
         self.savedata = self.ui.save_btn
         self.savedata.setToolTip(la.TT_SETTINGS[self.savedata.objectName()])
-        
+
         self.discarddata = self.ui.discard_btn
         self.discarddata.setToolTip(la.TT_SETTINGS[self.discarddata.objectName()])
 
@@ -241,7 +246,7 @@ def __init__(self, handler, width, height, parent=None):
         # NOTE connect ----------------------------------------
         self.hotkey_icon.clicked.connect(self.hotkeyicon_cb)
         self.dbpath_btn.clicked.connect(self.dbpath_cb)
-        self.cleardata.clicked.connect(self.cleardata_cb)
+        # self.cleardata.clicked.connect(self.cleardata_cb)
         self.aboutbtn.clicked.connect(self.window_cb)
         self.bugreportbtn.clicked.connect(self.window_cb)
         self.themebtn.clicked.connect(self.window_cb)
@@ -252,7 +257,7 @@ def __init__(self, handler, width, height, parent=None):
         # NOTE about_cb ---------------------------------------
         self.settingslayout = self.ui.verticallayout
         self.setLayout(self.ui.gridLayout)
-        
+
         # ----------------------------------- Startup Functions
         # NOTE Startup Functions ------------------------------
         self.updatecurrentvalues()
@@ -269,16 +274,17 @@ def closewindows(self):
     # ----------------------------------------- mapposition
     # NOTE mapposition ------------------------------------
     def mapposition(self, w, h, s):
-        parent =  s.parent()
-        pos = parent.mapToGlobal(QtCore.QPoint(w ,h))
+        parent = s.parent()
+        pos = parent.mapToGlobal(QtCore.QPoint(w, h))
         getattr(self, s.objectName()).setGeometry(
             pos.x(),
             pos.y() + parent.height(),
             getattr(self, s.objectName()).width(),
-            getattr(self, s.objectName()).height()) 
+            getattr(self, s.objectName()).height())
         getattr(self, s.objectName()).show()
+
     # !SECTION Functions
-        
+
     # --------------------------------------------------------------- Callbacks
     # SECTION Callbacks -------------------------------------------------------
     # ------------------------------------------- window_cb
@@ -290,18 +296,19 @@ def window_cb(self, toggled):
         self.closewindows()
         s = self.sender()
 
-        if toggled == True and not getattr(self, s.objectName()).isVisible():
+        if toggled is True and not getattr(self, s.objectName()).isVisible():
             self.mapposition(0, 0, s) if self.animatedsettings.isChecked() else self.mapposition(0, 0, s)
             getattr(self, s.objectName()).initmenu()
         else:
             if s.objectName() in self.windowlist:
                 getattr(self, s.objectName()).close()
-        
+
     # --------------------------------------- hotkeyicon_cb
     # NOTE hotkeyicon_cb ----------------------------------
     def hotkeyicon_cb(self):
-        self.settings['in_memory_db'] = self.in_memory_db.isChecked()
-        print(self.settings['in_memory_db'])
+        return
+        # self.settings['in_memory_db'] = self.in_memory_db.isChecked()
+        # print(self.settings['in_memory_db'])
 
     # ------------------------------------------- dbpath_cb
     # NOTE dbpath_cb --------------------------------------
@@ -330,16 +337,16 @@ def test1_cb(self):
         for i in range(len(util.HOTKEYLIST)):
             result = hou.hotkeys.findConflicts("h", util.HOTKEYLIST[i])
             if result:
-                print ("Confliction found: {}".format(result))
+                print("Confliction found: {}".format(result))
             else:
                 print("No Confliction: {}".format(result))
             hkeys.append(result)
-        print (hkeys)
+        print(hkeys)
 
     # --------------------------------------- cleardata_cb
     # NOTE cleardata_cb ----------------------------------
-    def cleardata_cb(self):
-        self.datahandler.cleardb()
+    # def cleardata_cb(self):
+    #     self.datahandler.cleardb()
 
     # --------------------------------------------- save_cb
     # NOTE save_cb ----------------------------------------
@@ -365,7 +372,7 @@ def save_cb(self):
                 print(self.settings)
 
             settings_data.savesettings(self.settings)
-            
+
             if self.resetdb:
                 hou.session.DBCONNECTION = None
                 hou.session.DATABASE = None
@@ -397,7 +404,7 @@ def discard_cb(self):
         if self.settings[util.SETTINGS_KEYS[8]]:
             self.parentwindow.anim.start_animation(False)
             self.isopened = True
-            self.performcheck=True
+            self.performcheck = True
         else:
             self.close()
 
@@ -418,7 +425,7 @@ def updatecurrentvalues(self):
                 getattr(self, util.SETTINGS_KEYS[i]).setValue(int(self.currentsettings[util.SETTINGS_KEYS[i]]))
             elif util.SETTINGS_TYPES[util.SETTINGS_KEYS[i]] == "cbx":
                 getattr(self, util.SETTINGS_KEYS[i]).setCurrentText(str(self.currentsettings[util.SETTINGS_KEYS[i]]))
-    
+
     # ------------------------------------------ fieldsetup
     # NOTE fieldsetup -------------------------------------
     def fieldsetup(self):
@@ -453,7 +460,7 @@ def checkforchanges(self):
                     print("Shown settings: ", getattr(self, util.SETTINGS_KEYS[i]).isChecked())
                     print("Current settings: ", bc(self.currentsettings[util.SETTINGS_KEYS[i]]))
                 if getattr(self, util.SETTINGS_KEYS[i]).isChecked() != bc(self.currentsettings[util.SETTINGS_KEYS[i]]):
-                    if util.SETTINGS_KEYS[i] == util.SETTINGS_KEYS[0]: 
+                    if util.SETTINGS_KEYS[i] == util.SETTINGS_KEYS[0]:
                         self.resetdb = True
                     elif util.SETTINGS_KEYS[i] == util.SETTINGS_KEYS[8]:
                         self.waitforclose = True
@@ -466,7 +473,7 @@ def checkforchanges(self):
                 if self.isdebug and self.isdebug.level in {"ALL"}:
                     print("Name: ", getattr(self, util.SETTINGS_KEYS[i]).objectName())
                     print("Shown settings: ", getattr(self, util.SETTINGS_KEYS[i]).text())
-                    print("Current settings: ",self.currentsettings[util.SETTINGS_KEYS[i]])
+                    print("Current settings: ", self.currentsettings[util.SETTINGS_KEYS[i]])
                 if getattr(self, util.SETTINGS_KEYS[i]).text() != self.currentsettings[util.SETTINGS_KEYS[i]]:
                     if self.isdebug and self.isdebug.level in {"ALL"}:
                         print("Offending item: ", i)
@@ -475,7 +482,7 @@ def checkforchanges(self):
                 if self.isdebug and self.isdebug.level in {"ALL"}:
                     print("Name: ", getattr(self, util.SETTINGS_KEYS[i]).objectName())
                     print("Shown settings: ", getattr(self, util.SETTINGS_KEYS[i]).value())
-                    print("Current settings: ",self.currentsettings[util.SETTINGS_KEYS[i]])
+                    print("Current settings: ", self.currentsettings[util.SETTINGS_KEYS[i]])
                 if getattr(self, util.SETTINGS_KEYS[i]).value() != int(self.currentsettings[util.SETTINGS_KEYS[i]]):
                     if self.isdebug and self.isdebug.level in {"ALL"}:
                         print("Offending item: ", i)
@@ -485,11 +492,13 @@ def checkforchanges(self):
                     print("Name: ", getattr(self, util.SETTINGS_KEYS[i]).objectName())
                     print("Shown settings: ", getattr(self, util.SETTINGS_KEYS[i]).currentText())
                     print("Current settings: ", str(self.currentsettings[util.SETTINGS_KEYS[i]]))
-                if getattr(self, util.SETTINGS_KEYS[i]).currentText() != str(self.currentsettings[util.SETTINGS_KEYS[i]]):
+                if getattr(self, util.SETTINGS_KEYS[i]).currentText() != str(
+                        self.currentsettings[util.SETTINGS_KEYS[i]]):
                     if self.isdebug and self.isdebug.level in {"ALL"}:
                         print("Offending item: ", i)
                     return True
         return False
+
     # ------------------------------------------- savecheck
     # NOTE savecheck --------------------------------------
     def savecheck(self):
@@ -504,7 +513,7 @@ def savecheck(self):
             self.hkholder = ""
         elif buttonindex == 1:
             self.hkholder = ""
-    
+
     # ------------------------------------ closeroutine
     # NOTE closeroutine -------------------------------
     def closeroutine(self):
@@ -527,6 +536,7 @@ def closeroutine(self):
 
     # !SECTION Actions
 
+    # @formatter:off
     def movesubwindows(self, pos, resize=False):
         if self.about.isVisible():
             if resize: self.about.move(self.about.x() + pos.x(), self.about.y())
@@ -544,9 +554,11 @@ def movesubwindows(self, pos, resize=False):
     # NOTE addeventfilters --------------------------------
     def addeventfilters(self):
         self.installEventFilter(self)
-        self.about.installEventFilter(self)
+        self.aboutbtn.installEventFilter(self)
+        self.themebtn.installEventFilter(self)
         self.savedata.installEventFilter(self)
-        self.cleardata.installEventFilter(self)
+        self.dbpath_btn.installEventFilter(self)
+        # self.cleardata.installEventFilter(self)
         self.discarddata.installEventFilter(self)
         self.bugreportbtn.installEventFilter(self)
         self.ui.dbpath_lbl.installEventFilter(self)
@@ -557,9 +569,11 @@ def addeventfilters(self):
     # NOTE removeeventfilters -----------------------------
     def removeeventfilters(self):
         self.removeEventFilter(self)
-        self.about.removeEventFilter(self)
+        self.aboutbtn.removeEventFilter(self)
+        self.themebtn.removeEventFilter(self)
         self.savedata.removeEventFilter(self)
-        self.cleardata.removeEventFilter(self)
+        self.dbpath_btn.removeEventFilter(self)
+        # self.cleardata.removeEventFilter(self)
         self.discarddata.removeEventFilter(self)
         self.bugreportbtn.removeEventFilter(self)
         self.ui.dbpath_lbl.removeEventFilter(self)
@@ -612,28 +626,28 @@ def eventFilter(self, obj, event):
         # ---------------------------------------- Keypress
         # SECTION Keypress --------------------------------
         if event_type == QtCore.QEvent.KeyPress:
-        # ---------------------------------- Key_D
-        # NOTE Key_D -----------------------------
+            # ---------------------------------- Key_D
+            # NOTE Key_D -----------------------------
             if event.key() == QtCore.Qt.Key_D:
                 if obj != self.defaulthotkey:
                     if not self.debugflag.isVisible():
                         self.debugflag.setVisible(True)
 
-        # ----------------------------- Key_Escape
-        # NOTE Key_Escape ------------------------
+            # ----------------------------- Key_Escape
+            # NOTE Key_Escape ------------------------
             if event.key() == QtCore.Qt.Key_Escape:
                 if obj == self:
                     self.closeroutine()
                     return True
 
-        # ----------------------------------- else
-        # NOTE else ------------------------------
+            # ----------------------------------- else
+            # NOTE else ------------------------------
             else:
                 if obj == self.defaulthotkey:
                     self.keyindex += 1
                     self.keystring = hou.qt.qtKeyToString(
-                        event.key(), 
-                        int(event.modifiers()), 
+                        event.key(),
+                        int(event.modifiers()),
                         event.text()
                     )
                     if self.canedit:
@@ -665,22 +679,21 @@ def eventFilter(self, obj, event):
             self.ui.isopened = False
             self.resetdb = False
             self.parentwindow.opensettingstool.setChecked(False)
-            self.performcheck=True
+            self.performcheck = True
             if not self.parentwindow.isActiveWindow():
                 self.parentwindow.activateWindow()
             self.removeeventfilters()
-            
-        return QtCore.QObject.eventFilter(self, obj, event)
-    
-    # !SECTION Events
 
-class LinkLabel(QtWidgets.QLabel):
-    def __init__(self, parent, text):
-        super(LinkLabel, self).__init__(parent)
+        return QtCore.QObject.eventFilter(self, obj, event)
 
-        self.setText(text)
-        self.setTextFormat(Qt.RichText)
-        self.setTextInteractionFlags(Qt.TextBrowserInteraction)
-        self.setOpenExternalLinks(True)
+    # !SECTION Events
 
 
+# class LinkLabel(QtWidgets.QLabel):
+#     def __init__(self, parent, text):
+#         super(LinkLabel, self).__init__(parent)
+# 
+#         self.setText(text)
+#         self.setTextFormat(Qt.RichText)
+#         self.setTextInteractionFlags(Qt.TextBrowserInteraction)
+#         self.setOpenExternalLinks(True)
diff --git a/python2.7libs/searcher/searcher_settings_ui.py b/python2.7libs/searcher/searcher_settings_ui.py
index 24d0e64..f9e9ad0 100644
--- a/python2.7libs/searcher/searcher_settings_ui.py
+++ b/python2.7libs/searcher/searcher_settings_ui.py
@@ -3,14 +3,14 @@
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 else:
-    from PyQt5 import QtGui
-    from PyQt5 import QtCore
-    from PyQt5 import QtWidgets
+    from qtpy import QtGui
+    from qtpy import QtCore
+    from qtpy import QtWidgets
 
 def bc(v):
     return str(v).lower() in ("yes", "true", "t", "1")
@@ -52,8 +52,8 @@ def setupUi(self, SearcherSettings, width, height, animated):
         self.projectTitle.setObjectName("projectTitle")
         self.headerrow.addWidget(self.projectTitle)
 
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.headerrow.addItem(spacerItem)
+        spaceritem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.headerrow.addItem(spaceritem)
 
         self.animatedsettings_chk = QtWidgets.QCheckBox(SearcherSettings)
         self.animatedsettings_chk.setLayoutDirection(QtCore.Qt.RightToLeft)
@@ -82,8 +82,12 @@ def setupUi(self, SearcherSettings, width, height, animated):
         # self.lang_cbox.addItem("")
         # self.secondrow.addWidget(self.lang_cbox)
 
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.secondrow.addItem(spacerItem)
+        spaceritem = QtWidgets.QSpacerItem(
+            40, 20,
+            QtWidgets.QSizePolicy.Expanding,
+            QtWidgets.QSizePolicy.Minimum
+        )
+        self.secondrow.addItem(spaceritem)
 
         self.maxresults_lbl = QtWidgets.QLabel(SearcherSettings)
         self.maxresults_lbl.setObjectName("maxresults_lbl")
@@ -122,7 +126,7 @@ def setupUi(self, SearcherSettings, width, height, animated):
         self.hotkey_icon.setObjectName("hotkey_icon")
         self.thirdrow.addWidget(self.hotkey_icon)
         self.verticallayout.addLayout(self.thirdrow)
-        
+
         # ------------------------------------------------- fourthrow
         # NOTE Fourth Row -------------------------------------------
         self.fourthrow = QtWidgets.QHBoxLayout()
@@ -139,17 +143,17 @@ def setupUi(self, SearcherSettings, width, height, animated):
         self.dbpath_icon = QtWidgets.QToolButton(SearcherSettings)
         self.dbpath_icon.setObjectName("dbpath_icon")
         self.fourthrow.addWidget(self.dbpath_icon)
-    
+
         self.verticallayout.addLayout(self.fourthrow)
-    
+
         # -------------------------------------------------- fifthrow
         # NOTE Fifth Row --------------------------------------------
         self.fifthrow = QtWidgets.QHBoxLayout()
         self.fifthrow.setObjectName("fifthrow")
 
-        self.maint_lbl = QtWidgets.QLabel(SearcherSettings)
-        self.maint_lbl.setObjectName("maint_lbl")
-        self.fifthrow.addWidget(self.maint_lbl)
+        # self.maint_lbl = QtWidgets.QLabel(SearcherSettings)
+        # self.maint_lbl.setObjectName("maint_lbl")
+        # self.fifthrow.addWidget(self.maint_lbl)
 
         # self.metrics_chk = QtWidgets.QCheckBox(SearcherSettings)
         # self.metrics_chk.setLayoutDirection(QtCore.Qt.RightToLeft)
@@ -157,9 +161,9 @@ def setupUi(self, SearcherSettings, width, height, animated):
         # self.metrics_chk.setObjectName("metrics_chk")
         # self.fifthrow.addWidget(self.metrics_chk)
 
-        self.cleardata_btn = QtWidgets.QPushButton(SearcherSettings)
-        self.cleardata_btn.setObjectName("cleardata_btn")
-        self.fifthrow.addWidget(self.cleardata_btn)
+        # self.cleardata_btn = QtWidgets.QPushButton(SearcherSettings)
+        # self.cleardata_btn.setObjectName("cleardata_btn")
+        # self.fifthrow.addWidget(self.cleardata_btn)
 
         # self.verticallayout.addLayout(self.fifthrow)
 
@@ -251,8 +255,8 @@ def retranslateUi(self, SearcherSettings):
         self.dbpath_icon.setText(_translate("SearcherSettings", "..."))
 
         # -------------------------------------------------- fifthrow
-        self.maint_lbl.setText(_translate("SearcherSettings", "Maintenance utilities:"))
-        self.cleardata_btn.setText(_translate("SearcherSettings", "Clear Data"))
+        # self.maint_lbl.setText(_translate("SearcherSettings", "Maintenance utilities:"))
+        # self.cleardata_btn.setText(_translate("SearcherSettings", "Clear Data"))
 
         # ------------------------------------------------- sixthrow
         self.about_btn.setText(_translate("SearcherSettings", "..."))
diff --git a/python2.7libs/searcher/searcher_ui.py b/python2.7libs/searcher/searcher_ui.py
index 4cf8792..f1792d4 100644
--- a/python2.7libs/searcher/searcher_ui.py
+++ b/python2.7libs/searcher/searcher_ui.py
@@ -3,29 +3,30 @@
 
 import os
 import sys
+from searcher import HelpButton
+from searcher import language_en as la
 
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 else:
-    from PyQt5 import QtGui
-    from PyQt5 import QtCore
-    from PyQt5 import QtWidgets
+    from qtpy import QtGui
+    from qtpy import QtCore
+    from qtpy import QtWidgets
 
-from searcher import HelpButton
-from searcher import language_en as la
 
+# noinspection PyAttributeOutsideInit
 class Ui_Searcher(object):
     def setupUi(self, Searcher, animated):
         self.animated = animated
         Searcher.setObjectName("Searcher")
         Searcher.setWindowModality(QtCore.Qt.NonModal)
         Searcher.setStyleSheet(u"background-color: rgb(42,42,42); border: 0px solid black")
-        
+
         self.mainlayout = QtWidgets.QVBoxLayout()
         self.gridLayout = QtWidgets.QGridLayout()
         self.gridLayout.setSpacing(0)
@@ -44,7 +45,7 @@ def setupUi(self, Searcher, animated):
         )
 
         # ------------------------------------------ Header
-        # NOTE Header ------------------------------------- 
+        # NOTE Header -------------------------------------
         self.searcherlbl = QtWidgets.QLabel("Searcher")
         font = QtGui.QFont()
         font.setPointSize(15)
@@ -65,13 +66,13 @@ def setupUi(self, Searcher, animated):
 
         self.contexttoggle = QtWidgets.QPushButton()
         self.contexttoggle.setObjectName("contexttoggle")
-        
+
         self.helpButton = HelpButton.HelpButton("main", la.TT_MW['helpButton'], 16)
         self.helpButton.setObjectName("helpButton")
-        
+
         self.pinwindow_btn = QtWidgets.QToolButton()
         self.pinwindow_btn.setObjectName("pinwindow")
-        
+
         self.opensettings_btn = QtWidgets.QToolButton()
         self.opensettings_btn.setObjectName("opensettingstool")
 
@@ -81,7 +82,7 @@ def setupUi(self, Searcher, animated):
             QtWidgets.QSizePolicy.Minimum
         )
 
-         # ----------------------------------- Search Filter
+        # ----------------------------------- Search Filter
         # NOTE Search Filter ------------------------------
         self.searchrow = QtWidgets.QHBoxLayout()
         self.searchrow.setSpacing(0)
@@ -108,7 +109,7 @@ def setupUi(self, Searcher, animated):
         self.searchfilter_btn.setArrowType(QtCore.Qt.NoArrow)
         self.searchfilter_btn.setParent(self.frame)
 
-          # -------------------------------------- Search Box
+        # -------------------------------------- Search Box
         # NOTE Search Box ---------------------------------
         self.searchbox_txt = QtWidgets.QLineEdit()
         self.searchbox_txt.setObjectName("searchbox")
@@ -138,7 +139,7 @@ def setupUi(self, Searcher, animated):
         resultstree_header.setPointSize(9)
         __qtreewidgetitem.setFont(0, resultstree_header)
         self.searchresults_tree.setHeaderItem(__qtreewidgetitem)
-        
+
         resultstree_details = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Preferred,
             QtWidgets.QSizePolicy.Expanding
@@ -146,11 +147,11 @@ def setupUi(self, Searcher, animated):
         resultstree_details.setHorizontalStretch(0)
         resultstree_details.setVerticalStretch(0)
         self.searchresults_tree.setSizePolicy(resultstree_details)
-        
+
         resultstree_font = QtGui.QFont()
         resultstree_font.setPointSize(9)
         self.searchresults_tree.setFont(resultstree_font)
-        
+
         self.searchresults_tree.setMouseTracking(False)
         self.searchresults_tree.setFocusPolicy(QtCore.Qt.NoFocus)
         self.searchresults_tree.setFrameShadow(QtWidgets.QFrame.Sunken)
@@ -167,7 +168,7 @@ def setupUi(self, Searcher, animated):
         self.infobar.setObjectName("infobar")
         self.infobargrid = QtWidgets.QGridLayout()
         self.infobargrid.setObjectName("infobargrid")
-        
+
         # -------------------------------------- Info Panel
         # NOTE Info Panel ---------------------------------
         self.info_lbl = QtWidgets.QLabel()
@@ -176,10 +177,11 @@ def setupUi(self, Searcher, animated):
         self.infolbl_font.setBold(False)
         self.infolbl_font.setWeight(40)
         self.info_lbl.setFont(self.infolbl_font)
-        self.info_lbl.setStyleSheet(u"background-color: rgba(11, 11, 11, 0); border-bottom: 1px solid rgb(100, 100, 100);")
+        self.info_lbl.setStyleSheet(
+            u"background-color: rgba(11, 11, 11, 0); border-bottom: 1px solid rgb(100, 100, 100);")
         self.info_lbl.setMargin(3)
         self.info_lbl.setIndent(5)
-        
+
         # -------------------------------------- Info Panel
         # NOTE Info Panel ---------------------------------
         self.overlay = overlayLabel(self.info_lbl)
@@ -187,7 +189,7 @@ def setupUi(self, Searcher, animated):
         self.overlay.setStyleSheet(u"background-color: rgb(11, 11, 11); border-bottom: 1px solid rgb(100, 100, 100); ")
         self.overlay.setMargin(3)
         self.overlay.setIndent(5)
-        
+
         # -------------------------------------- Info Panel
         # NOTE Info Panel ---------------------------------
         self.treetotal_lbl = QtWidgets.QLabel()
@@ -197,17 +199,18 @@ def setupUi(self, Searcher, animated):
         treetotal_size.setHorizontalStretch(0)
         treetotal_size.setVerticalStretch(0)
         treetotal_size.setHeightForWidth(self.treetotal_lbl.sizePolicy().hasHeightForWidth())
-        self.treetotal_lbl.setSizePolicy(treetotal_size)        
+        self.treetotal_lbl.setSizePolicy(treetotal_size)
         self.treetotal_lbl.setMinimumSize(QtCore.QSize(160, 0))
-        self.treetotal_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        
+        self.treetotal_lbl.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+
         # Style ---------
         self.treetotallbl_font = QtGui.QFont()
         self.treetotallbl_font.setPointSize(9)
         self.treetotallbl_font.setBold(False)
         self.treetotallbl_font.setWeight(50)
         self.treetotal_lbl.setFont(self.treetotallbl_font)
-        self.treetotal_lbl.setStyleSheet(u"background-color: rgb(11, 11, 11); border-bottom: 1px solid rgb(100, 100, 100); ")
+        self.treetotal_lbl.setStyleSheet(
+            u"background-color: rgb(11, 11, 11); border-bottom: 1px solid rgb(100, 100, 100); ")
         self.treetotal_lbl.setMargin(3)
         self.treetotal_lbl.setIndent(5)
 
@@ -224,26 +227,24 @@ def setupUi(self, Searcher, animated):
         self.titlerow.addWidget(self.opensettings_btn)
         self.titlerow.addItem(self.titlespacer3)
         self.verticalLayout.addLayout(self.titlerow)
-        
+
         # self.searchrow.addWidget(self.frame)
         self.searchgrid = QtWidgets.QGridLayout()
-        self.searchgrid.addWidget(self.frame, 1,0,1,1)
-        self.searchgrid.addWidget(self.searchfilter_btn, 1,0,1,1)
-        self.searchgrid.addWidget(self.searchbox_txt, 1,1,1,1)
+        self.searchgrid.addWidget(self.frame, 1, 0, 1, 1)
+        self.searchgrid.addWidget(self.searchfilter_btn, 1, 0, 1, 1)
+        self.searchgrid.addWidget(self.searchbox_txt, 1, 1, 1, 1)
         self.searchrow.addLayout(self.searchgrid)
         self.verticalLayout.addLayout(self.searchrow)
-        
+
         self.verticalLayout.addWidget(self.searchresults_tree)
         self.gridLayout.addLayout(self.verticalLayout, 1, 0, 1, 1)
-        
-        
+
         self.infobargrid.addWidget(self.overlay, 1, 0, 1, 1)
         self.infobargrid.addWidget(self.info_lbl, 1, 0, 1, 1)
         self.infobargrid.addWidget(self.treetotal_lbl, 1, 1, 1, 1)
         self.infobar.addLayout(self.infobargrid)
         self.gridLayout.addLayout(self.infobar, 3, 0, 1, 1)
 
-
         self.mainlayout.setContentsMargins(0, 0, 0, 0)
 
         # --------------------------------------- ResizeHandles
@@ -253,12 +254,12 @@ def setupUi(self, Searcher, animated):
         self.leftresize.setMaximumSize(QtCore.QSize(25, 25))
         self.leftresize.setStyleSheet(u"color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);")
         pos = self.info_lbl.mapToGlobal(
-                    QtCore.QPoint(-3, 0))
+            QtCore.QPoint(-3, 0))
         self.leftresize.setGeometry(
-                pos.x(),
-                pos.y(),
-                self.leftresize.width(),
-                self.leftresize.height()
+            pos.x(),
+            pos.y(),
+            self.leftresize.width(),
+            self.leftresize.height()
         )
 
         self.rightresize = QtWidgets.QSizeGrip(self.treetotal_lbl)
@@ -266,18 +267,18 @@ def setupUi(self, Searcher, animated):
         self.rightresize.setObjectName("resizeright")
         self.rightresize.setStyleSheet(u"color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);")
         pos = self.treetotal_lbl.mapToGlobal(
-                    QtCore.QPoint(138, 0))
+            QtCore.QPoint(138, 0))
         self.rightresize.setGeometry(
-                pos.x(),
-                pos.y(),
-                self.rightresize.width(),
-                self.rightresize.height()
+            pos.x(),
+            pos.y(),
+            self.rightresize.width(),
+            self.rightresize.height()
         )
         self.vlayout = self.gridLayout
         # self.mainlayout.addLayout(self.gridLayout)
-       
+
 
 class overlayLabel(QtWidgets.QLabel):
     def __init__(self, parent=None):
         super(overlayLabel, self).__init__(parent)
-        self.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
\ No newline at end of file
+        self.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
diff --git a/python2.7libs/searcher/settings_data.py b/python2.7libs/searcher/settings_data.py
index 8d45f15..31a7b47 100644
--- a/python2.7libs/searcher/settings_data.py
+++ b/python2.7libs/searcher/settings_data.py
@@ -11,7 +11,7 @@
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.') + 1:])
+    # hver = int(ver[ver.rindex('.') + 1:])
     from hutil.Qt import QtCore
 
 # ------------------------------------------------------ Setting Paths
@@ -26,10 +26,12 @@
 searcher_settings = os.path.join(
     searcher_path, settingsfile
 )
-defaultdbpath =  os.path.join(
+defaultdbpath = os.path.join(
     searcher_path, dbfile
 )
 settingsdata = QtCore.QSettings(searcher_settings, QtCore.QSettings.IniFormat)
+
+
 # !SECTION Setting Paths
 
 # -------------------------------------------------- Setting Functions
@@ -55,6 +57,7 @@ def createdefaults(platform):
     settingsdata.setIniCodec('UTF-8')
     settingsdata.sync()
 
+
 # ---------------------------------------- savesettings
 # NOTE savesettings -----------------------------------
 def savesettings(settingdict):
@@ -72,6 +75,7 @@ def savesettings(settingdict):
         else:
             print(la.SETTINGSMESSAGES['savesettings'] + str(e))
 
+
 # ---------------------------------------- loadsettings
 # NOTE loadsettings -----------------------------------
 def loadsettings():
diff --git a/python2.7libs/searcher/style.py b/python2.7libs/searcher/style.py
index 38d5275..22d6d76 100644
--- a/python2.7libs/searcher/style.py
+++ b/python2.7libs/searcher/style.py
@@ -4,13 +4,14 @@
 import hou
 import os
 from searcher import util
+
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
 else:
-    from PyQt5 import QtGui
+    from qtpy import QtGui
 
 # --------------------------------------------------- Paths
 # NOTE Paths ----------------------------------------------
@@ -20,6 +21,7 @@
 
 settings = util.get_settings()
 
+
 # ----------------------------------------------- Functions
 # NOTE Functions ------------------------------------------
 def count_chars(txt):
@@ -28,14 +30,17 @@ def count_chars(txt):
         result += 1
     return result
 
+
 # --------------------------------------------------------------- UI Style
 # SECTION UI Style -------------------------------------------------------
 # ---------------------------------------------- MAINWINDOW
 # NOTE MAINWINDOW -----------------------------------------
+# @formatter:off
 MAINWINDOW = """ background-color: rgb(42, 42, 42); """
 
 # ------------------------------------------- CONTEXTTOGGLE
 # NOTE CONTEXTTOGGLE --------------------------------------
+# @formatter:off
 CONTEXTTOGGLE = """ QPushButton { width: 8px; border: none; }
                     QPushButton:checked { width: 8px; border: none;} """
 
@@ -45,6 +50,7 @@ def count_chars(txt):
 
 # ----------------------------------------------- MENUSTYLE
 # NOTE MENUSTYLE ------------------------------------------
+# @formatter:off
 MENUSTYLE = """QMenu { background-color: rgb(64,64,64); menu-scrollable: 1; margin: 0px; }
                    QMenu:item { background-color: rgb(46,46,46);  padding: 5px 25px; margin: 1px; height:16px; }
                    QMenu:item:selected { background-color: rgb(64,64,64); }
@@ -54,6 +60,7 @@ def count_chars(txt):
 
 # ------------------------------------------------- TOOLTIP
 # NOTE TOOLTIP --------------------------------------------
+# @formatter:off
 TOOLTIP = """QToolTip { background-color: rgb(64,64,64); menu-scrollable: 1; margin: 0px; }
                    QToolTip:item { background-color: rgb(46,46,46);  padding: 5px 25px ; margin: 1px; height:16px; }
                    QToolTip:icon { padding: 5px; }
@@ -61,11 +68,13 @@ def count_chars(txt):
 
 # -------------------------------------------- SETTINGSMENU
 # NOTE SETTINGSMENU ---------------------------------------
+# @formatter:off
 SETTINGSMENU = """ QWidget { background: rgb(58, 58, 58); }
                    QWidget#SearcherSettings { border: 0px solid rgb(35, 35, 35); }  """
 
 # --------------------------------------- styleresizehandle
 # NOTE styleresizehandle ----------------------------------
+# @formatter:off
 def styleresizehandle(obj, enter):
     if enter:
         resizeimg = (imgroot + "/%s.png" % obj.objectName())
@@ -79,7 +88,7 @@ def styleresizehandle(obj, enter):
                 width: 25px;
                 height: 25px;
                 background-color: rgba(0, 0, 0, 0);
-                }""" 
+                }"""
             % resizeimg
             )
         obj.setStyleSheet(sheet)
@@ -91,12 +100,13 @@ def styleresizehandle(obj, enter):
                 width: 15px;
                 height: 15px;
                 background-color: rgba(0, 0, 0, 0);
-                }""" 
+                }"""
             )
         obj.setStyleSheet(sheet)
 
 # ---------------------------------------- styleresulttotal
 # NOTE styleresulttotal -----------------------------------
+# @formatter:off
 def styleresulttotal(treecatnum, treeitemsnum):
     appcolors = settings[util.SETTINGS_KEYS[14]]
     return (("<font color='%s'><b>%s</b></font> : <font color='%s'>Contexts </font> | " % (appcolors[util.COLORFIELDS[2]], treecatnum, appcolors[util.COLORFIELDS[0]]))
@@ -104,6 +114,7 @@ def styleresulttotal(treecatnum, treeitemsnum):
 
 # --------------------------------------------- styletimers
 # NOTE styletimers ----------------------------------------
+# @formatter:off
 def styletimers(outdata):
     appcolors = settings[util.SETTINGS_KEYS[14]]
     return (("<font color='%s'>Search Regex <font color='%s'> <b>%0.4f</b> </font> ms</font> | " % (str(appcolors[util.COLORFIELDS[0]]), str(appcolors[util.COLORFIELDS[2]]), outdata[0])) 
@@ -114,6 +125,7 @@ def styletimers(outdata):
 
 # -------------------------------------------- returntimers
 # NOTE returntimers ---------------------------------------
+# @formatter:off
 def returntimers(outdata):
     return (("Search Regex  %0.4f ms | " % outdata[0])
               + ("Context Search  %0.4f ms | " % outdata[1])
@@ -123,6 +135,7 @@ def returntimers(outdata):
 
 # -------------------------------------------- setstatusmsg
 # NOTE setstatusmsg ---------------------------------------
+# @formatter:off
 def setstatusmsg(text, severity):
     stype, scolor = util.SEVERITY[severity]
     msg = (("<font color='%s'>%s</font>" % (scolor, text)))
@@ -130,11 +143,13 @@ def setstatusmsg(text, severity):
 
 # ----------------------------------------- gettooltipstyle
 # NOTE gettooltipstyle ------------------------------------
+# @formatter:off
 def gettooltipstyle(text):
     return (("<font color='%s'>%s</font>" % (settings[util.SETTINGS_KEYS[14]][util.COLORFIELDS[4]], text)))
 
 # ---------------------------------------- gettreeviewstyle
 # NOTE gettreeviewstyle -----------------------------------
+# @formatter:off
 def gettreeviewstyle():
     PATH = os.path.join(script_path, "images")
     root = PATH.replace("\\", "/")
diff --git a/python2.7libs/searcher/theme.py b/python2.7libs/searcher/theme.py
index a1d77b4..5f5e43a 100644
--- a/python2.7libs/searcher/theme.py
+++ b/python2.7libs/searcher/theme.py
@@ -14,14 +14,14 @@
 hver = 0
 if os.environ["HFS"] != "":
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.')+1:])
     from hutil.Qt import QtGui
     from hutil.Qt import QtCore
     from hutil.Qt import QtWidgets
 else:
-    from PyQt5 import QtGui
-    from PyQt5 import QtCore
-    from PyQt5 import QtWidgets
+    from qtpy import QtGui
+    from qtpy import QtCore
+    from qtpy import QtWidgets
 
 scriptpath = os.path.dirname(os.path.realpath(__file__))
 
diff --git a/python2.7libs/searcher/ui_files/SearcherSettings.py b/python2.7libs/searcher/ui_files/SearcherSettings.py
index 548bcf9..66e102c 100644
--- a/python2.7libs/searcher/ui_files/SearcherSettings.py
+++ b/python2.7libs/searcher/ui_files/SearcherSettings.py
@@ -2,12 +2,12 @@
 
 # Form implementation generated from reading ui file 'SearcherSettings.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: qtpy UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class Ui_SearcherSettings(object):
diff --git a/python2.7libs/searcher/ui_files/about.py b/python2.7libs/searcher/ui_files/about.py
index 5e09f15..d334bba 100644
--- a/python2.7libs/searcher/ui_files/about.py
+++ b/python2.7libs/searcher/ui_files/about.py
@@ -2,12 +2,12 @@
 
 # Form implementation generated from reading ui file 'about.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: qtpy UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class Ui_About(object):
diff --git a/python2.7libs/searcher/ui_files/bugreport.py b/python2.7libs/searcher/ui_files/bugreport.py
index 7a42c03..5236825 100644
--- a/python2.7libs/searcher/ui_files/bugreport.py
+++ b/python2.7libs/searcher/ui_files/bugreport.py
@@ -2,12 +2,12 @@
 
 # Form implementation generated from reading ui file 'bugreport.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: qtpy UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class Ui_BugReport(object):
diff --git a/python2.7libs/searcher/ui_files/bugreport.ui b/python2.7libs/searcher/ui_files/bugreport.ui
index d436a0f..b0a9cfa 100644
--- a/python2.7libs/searcher/ui_files/bugreport.ui
+++ b/python2.7libs/searcher/ui_files/bugreport.ui
@@ -48,6 +48,29 @@
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <layout class="QHBoxLayout" name="secondrow">
+       <item alignment="Qt::AlignLeft">
+        <widget class="QComboBox" name="comboBox">
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
+         <property name="frame">
+          <bool>false</bool>
+         </property>
+         <item>
+          <property name="text">
+           <string>123</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>123123</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item>
         <widget class="QLineEdit" name="title">
          <property name="minimumSize">
diff --git a/python2.7libs/searcher/ui_files/searcher_ui.py b/python2.7libs/searcher/ui_files/searcher_ui.py
index 500e4fd..52e4c64 100644
--- a/python2.7libs/searcher/ui_files/searcher_ui.py
+++ b/python2.7libs/searcher/ui_files/searcher_ui.py
@@ -2,12 +2,12 @@
 
 # Form implementation generated from reading ui file 'searcher_ui.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: qtpy UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class Ui_Searcher(object):
diff --git a/python2.7libs/searcher/ui_files/theme_tabs.py b/python2.7libs/searcher/ui_files/theme_tabs.py
index 0c106ca..410a2ea 100644
--- a/python2.7libs/searcher/ui_files/theme_tabs.py
+++ b/python2.7libs/searcher/ui_files/theme_tabs.py
@@ -2,12 +2,12 @@
 
 # Form implementation generated from reading ui file 'theme_tabs.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: qtpy UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class Ui_Theme(object):
diff --git a/python2.7libs/searcher/util.py b/python2.7libs/searcher/util.py
index fab87c9..67fa1f8 100644
--- a/python2.7libs/searcher/util.py
+++ b/python2.7libs/searcher/util.py
@@ -1,25 +1,27 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
+import sys
+
 from searcher import enum
 
-from sys import platform
 from typing import Tuple
 import os
 import hou
+
 hver = 0
-if os.environ["HFS"] != "":
+if os.environ["HFS"] != "" or os.environ["HFS"] is not None:
     ver = os.environ["HFS"]
-    hver = int(ver[ver.rindex('.')+1:])
+    # hver = int(ver[ver.rindex('.') + 1:])
     from hutil.Qt import QtCore
 else:
-    from PyQt5 import QtCore
+    from qtpy import QtCore
 
 script_path = os.path.dirname(os.path.realpath(__file__))
 
-# ------------------------------------------------------- Helper Functions
+# @formatter:off ---------------------------------------- Helper Functions
 # SECTION Helper Functions -----------------------------------------------
-# --------------------------------------------- DEBUG_LEVEL
+# @formatter:off ------------------------------ DEBUG_LEVEL
 # NOTE DEBUG_LEVEL ----------------------------------------
 DEBUG_LEVEL = enum.Enum('NONE', 'TIMER', 'ALL')
 class Dbug(object):
@@ -28,6 +30,7 @@ def __init__(self, enabled, level, perf, mainwindow=False):
         self.level = level
         self.performance = perf
         self.mainwindow = mainwindow
+
     def __nonzero__(self): return bool(self.enabled)
 
 class AppColors(object):
@@ -38,35 +41,35 @@ def __init__(self, colors={}):
         self.stats2 =   colors[COLORFIELDS[3]]
         self.tooltip =  colors[COLORFIELDS[4]]
 
-# -------------------------------------------- get_platform
+# @formatter:off ----------------------------- get_platform
 # NOTE get_platform ---------------------------------------
 def get_platform():
     return getattr(hou.session, "PLATFORM", None)
 
-# -------------------------------------------- get_settings
+# @formatter:off ----------------------------- get_settings
 # NOTE get_settings ---------------------------------------
 def get_settings():
     return getattr(hou.session, "SETTINGS", None)
 
 
-    
-# -------------------------------------------- get_settings
+# @formatter:off ----------------------------- get_settings
 # NOTE get_settings ---------------------------------------
 def get_path(folders=None):
     script_path = os.path.dirname(os.path.realpath(__file__))
     PATH = os.path.join(script_path, '/'.join(folders))
     return PATH.replace("\\", "/")
 
-# ------------------------------------------ Bool Converter
+# @formatter:off --------------------------- Bool Converter
 # NOTE Bool Converter -------------------------------------
 def bc(v):
     return str(v).lower() in ("yes", "true", "t", "1")
 
 # !SECTION Helper Functions
 
-# --------------------------------------------------------------- Settings
+
+# @formatter:off ------------------------------------------------ Settings
 # SECTION Settings -------------------------------------------------------
-# ------------------------------------------- SETTINGS_KEYS
+# @formatter:off ---------------------------- SETTINGS_KEYS
 # NOTE SETTINGS_KEYS --------------------------------------
 SETTINGS_KEYS = [
     'in_memory_db',                          # 0
@@ -82,12 +85,12 @@ def bc(v):
     'debuglevel',                            # 10
     'lastkey',                               # 11
     'metrics',                               # 12
-    'metricsmainwindow',                     # 13                    
+    'metricsmainwindow',                     # 13
     'appcolors',                             # 14
     'expanditems',                           # 15
 ]
 
-# --------------------------------------------- COLORFIELDS
+# @formatter:off ------------------------------ COLORFIELDS
 # The names of the customizable colorfields
 # NOTE COLORFIELDS ----------------------------------------
 COLORFIELDS = [
@@ -98,7 +101,7 @@ def bc(v):
     'tooltip',                              # 4
 ]
 
-# ------------------------------------------ SETTINGS_TYPES
+# @formatter:off --------------------------- SETTINGS_TYPES
 # Include type if it is to be processed, else mark NA
 # {bool, text, int, intval} get processed by settings menu
 # {flag} is a bool but handled separate from settings menu
@@ -123,17 +126,18 @@ def bc(v):
     SETTINGS_KEYS[15]: 'flag',               # expanditems
 }
 
-# ---------------------------------------- DEFAULT_SETTINGS
+# @formatter:off ------------------------- DEFAULT_SETTINGS
 # Default settings automatically applied upon creations
 # NOTE DEFAULT_SETTINGS -----------------------------------
+defaultHKeys = u"Cmd+Alt+Shift+F7" if sys.platform == 'darwin' else u"Ctrl+Alt+Shift+F7"
 DEFAULT_SETTINGS = {
     SETTINGS_KEYS[0]: "False",               # in_memory_db
     SETTINGS_KEYS[1]: "",                    # database_path
-    SETTINGS_KEYS[2]: "False",               # savewindowsize
+    SETTINGS_KEYS[2]: "True",                # savewindowsize
     SETTINGS_KEYS[3]: [750, 350],            # windowsize
     SETTINGS_KEYS[4]: "False",               # debugflag
     SETTINGS_KEYS[5]: "False",               # pinwindow
-    SETTINGS_KEYS[6]: u"Ctrl+Alt+Shift+F7",  # defaulthotkey
+    SETTINGS_KEYS[6]: defaultHKeys,          # defaulthotkey
     SETTINGS_KEYS[7]: "True",                # showctx
     SETTINGS_KEYS[8]: "True",                # animatedsettings
     SETTINGS_KEYS[9]: 100,                   # maxresults
@@ -147,20 +151,20 @@ def bc(v):
         COLORFIELDS[2] : "#c2efe5",          # stats1
         COLORFIELDS[3] : "#c2efe5",          # stats2
         COLORFIELDS[4] : "#607FAE",          # tooltip
-    },         
+    },
     SETTINGS_KEYS[15]: "True",              # expanditems
 }
 # !SECTION Settings
 
-# ------------------------------------------------------- Key Translations
+# @formatter:off ---------------------------------------- Key Translations
 # SECTION Key Translations -----------------------------------------------
 
-# --------------------------------------------- CTXSHOTCUTS
+# @formatter:off ------------------------------ CTXSHOTCUTS
 # Context shortcodes for predefined results
 # NOTE CTXSHOTCUTS ----------------------------------------
 CTXSHOTCUTS = [":v", ":c", ":g"]
 
-# ------------------------------------------ KEYCONVERSIONS
+# @formatter:off --------------------------- KEYCONVERSIONS
 # Convertions for arrow keys (Should be moved to main dict)
 # NOTE KEYCONVERSIONS -------------------------------------
 KEYCONVERSIONS = {
@@ -170,51 +174,62 @@ def bc(v):
     "RightArrow": "right",
 }
 
-# ---------------------------------------------- HOTKEYLIST
+# @formatter:off ------------------------------- HOTKEYLIST
 # List of possible hotkeys to use a temp keys when running commands
 # NOTE HOTKEYLIST -----------------------------------------
 HOTKEYLIST = [
-    (u"Ctrl+Alt+Shift+F7"),
-    (u"Ctrl+Alt+Shift+F6"),
-    (u"Ctrl+Alt+Shift+F8"),
-    (u"Ctrl+Alt+Shift+F9"),
-    (u"Ctrl+Alt+Shift+F10")
+    u"Ctrl+Alt+Shift+F7",
+    u"Ctrl+Alt+Shift+F6",
+    u"Ctrl+Alt+Shift+F8",
+    u"Ctrl+Alt+Shift+F9",
+    u"Ctrl+Alt+Shift+F10"
+]
+
+HOTKEYLISTOSX = [
+    u"Cmd+Alt+Shift+F7",
+    u"Cmd+Alt+Shift+F6",
+    u"Cmd+Alt+Shift+F8",
+    u"Cmd+Alt+Shift+F9",
+    u"Cmd+Alt+Shift+F10"
 ]
 
 def gethotkeys():
     hkeys = []
     settings = get_settings()
     hkeys.append(settings[SETTINGS_KEYS[6]])
-    for key in HOTKEYLIST:
+    hklist = HOTKEYLISTOSX if sys.platform == 'darwin' else HOTKEYLIST
+    for key in hklist:
         hkeys.append(key)
     return hkeys
 
+
 # Used for bitmasking to determine modifiers
 MODIFIERS = {}
 # Used for constructing a bitmasked modifier
 REVERSE_MODIFIERS = {}
 
-# ------------------------------------------- MODIFIER_KEYS
+# @formatter:off ---------------------------- MODIFIER_KEYS
 # Used to detect if a keypress was just a modifier
 # NOTE MODIFIER_KEYS --------------------------------------
 MODIFIER_KEYS = {
     QtCore.Qt.Key_Alt:      "Alt",
-    QtCore.Qt.Key_Meta:     "Meta",
+    QtCore.Qt.Key_Meta:     "Cmd",
     QtCore.Qt.Key_Shift:    "Shift",
     QtCore.Qt.Key_Control:  "Ctrl",
 }
 
-# ----------------------------------------------- MODIFIERS
+# @formatter:off -------------------------------- MODIFIERS
 # NOTE MODIFIERS ------------------------------------------
 MODIFIERS = {
-    "Shift":        QtCore.Qt.ShiftModifier,
     "Control":      QtCore.Qt.ControlModifier,
     "Ctrl":         QtCore.Qt.ControlModifier,
+    "Shift":        QtCore.Qt.ShiftModifier,
     "Meta":         QtCore.Qt.MetaModifier,
+    "Cmd":          QtCore.Qt.MetaModifier,
     "Alt":          QtCore.Qt.AltModifier,
 }
 
-# -------------------------------------------- SPECIAL_KEYS
+# @formatter:off ----------------------------- SPECIAL_KEYS
 # Special keys
 # NOTE SPECIAL_KEYS ---------------------------------------
 SPECIAL_KEYS = {
@@ -236,7 +251,7 @@ def gethotkeys():
     QtCore.Qt.Key_Home:         "Page_Home",
 }
 
-# ------------------------------------------------ Platform
+# @formatter:off --------------------------------- Platform
 # # Platform conversions
 # NOTE Platform -------------------------------------------
 # if platform == "linux" or platform == "linux2":
@@ -284,10 +299,10 @@ def gethotkeys():
 #     REVERSE_MODIFIERS.update(tmp)
 # endregion
 
-# ------------------------------------------------ KEY_DICT
+# @formatter:off --------------------------------- KEY_DICT
 # NOTE KEY_DICT -------------------------------------------
 KEY_DICT = {
-    # ------------------------------------- Grey keys
+    # @formatter:off ---------------------- Grey keys
     "Escape":       QtCore.Qt.Key_Escape,
     "Tab":          QtCore.Qt.Key_Tab,
     "Backtab":      QtCore.Qt.Key_Backtab,
@@ -305,11 +320,12 @@ def gethotkeys():
     "Up":           QtCore.Qt.Key_Up,
     "Right":        QtCore.Qt.Key_Right,
     "Down":         QtCore.Qt.Key_Down,
-    "Prior":         None,
+    "Prior":        None,
     "Next":         None,
     "Shift":        QtCore.Qt.Key_Shift,
     "Control":      QtCore.Qt.Key_Control,
     "Ctrl":         QtCore.Qt.Key_Control,
+    "Cmd":          QtCore.Qt.Key_Meta,
     "Meta":         QtCore.Qt.Key_Meta,
     "Alt":          QtCore.Qt.Key_Alt,
     "CapsLock":     QtCore.Qt.Key_CapsLock,
@@ -355,7 +371,7 @@ def gethotkeys():
     "Menu":         QtCore.Qt.Key_Menu,
     "Hyper_L":      QtCore.Qt.Key_Hyper_L,
     "Hyper_R":      QtCore.Qt.Key_Hyper_R,
-    # ------------------------------------- Regular keys
+    # @formatter:off ---------------------- Regular keys
     "Space":        QtCore.Qt.Key_Space,
     "Exclam":       QtCore.Qt.Key_Exclam,
     "!":            QtCore.Qt.Key_Exclam,
@@ -460,9 +476,9 @@ def gethotkeys():
 }
 # !SECTION Key Translations
 
-# --------------------------------------------------- Houdini Translations
+# @formatter:off ------------------------------------ Houdini Translations
 # SECTION Houdini Translations -------------------------------------------
-# ---------------------------------------------- getcontext
+# @formatter:off ------------------------------- getcontext
 # NOTE getcontext -----------------------------------------
 def getcontext(editor):
     """Return houdini context string."""
@@ -484,7 +500,8 @@ def getcontext(editor):
     elif hou_context == 'Cop2':
         return 'COP'
 
-# --------------------------------------------- CONTEXTTYPE
+
+# @formatter:off ------------------------------ CONTEXTTYPE
 # NOTE CONTEXTTYPE ----------------------------------------
 CONTEXTTYPE = {
     "Cop2": "COP",
@@ -503,7 +520,7 @@ def getcontext(editor):
     "VopNet": "VEX",
 }
 
-# ----------------------------------------------- PANETYPES
+# @formatter:off -------------------------------- PANETYPES
 # NOTE PANETYPES ------------------------------------------
 PANETYPES = {
     hou.paneTabType.AssetBrowser:       [["h.pane.projectm"], "Asset Browser"],
@@ -535,10 +552,10 @@ def getcontext(editor):
 }
 # !SECTION Houdini Translations
 
-# --------------------------------------------------------------- UI Info
+# @formatter:off ------------------------------------------------ UI Info
 # SECTION UI Info -------------------------------------------------------
 
-# ------------------------------------------------ SEVERITY
+# @formatter:off --------------------------------- SEVERITY
 # NOTE SEVERITY -------------------------------------------
 SEVERITY = {
     "Message":              [hou.severityType.Message, "#FF0000"],
@@ -560,12 +577,12 @@ def getcontext(editor):
 # NETVIEW_image_link
 # NETVIEW_image_link_located
 # BUTTONS_resizegrip_se -------- Resize
-# BUTTONS_tree 
+# BUTTONS_tree
 # COMMON_opencolorio COP2_colorwheel - Nice color things
 
 # vop_terminals_connected
 # vop_terminals_collapsed
-# --------------------------------------------------- Icons
+# @formatter:off ------------------------------------ Icons
 # NOTE Icons ----------------------------------------------
 ICON_SIZE = hou.ui.scaledSize(32)
 EDIT_ICON_SIZE = hou.ui.scaledSize(28)
@@ -681,25 +698,26 @@ def getcontext(editor):
 
 # SECTION Widget Tools ---------------------------------------------------
 def widgets_at(mainwindow, pos):
-	"""Return ALL widgets at `pos`
-	Arguments:
-		pos (QPoint): Position at which to get widgets
-	"""
+    """Return ALL widgets at `pos`
+    Arguments:
+        pos (QPoint): Position at which to get widgets
+        :param mainwindow:
+    """
 
-	widgets = []
-	widget_at = mainwindow.widgetAt(pos)
+    widgets = []
+    widget_at = mainwindow.widgetAt(pos)
 
-	while widget_at:
-		widgets.append(widget_at)
+    while widget_at:
+        widgets.append(widget_at)
 
-		# Make widget invisible to further enquiries
-		widget_at.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents)
-		widget_at = mainwindow.widgetAt(pos)
+        # Make widget invisible to further enquiries
+        widget_at.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents)
+        widget_at = mainwindow.widgetAt(pos)
 
-	# Restore attribute
-	for widget in widgets:
-		widget.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents, False)
+    # Restore attribute
+    for widget in widgets:
+        widget.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents, False)
 
-	return widgets
+    return widgets
 
-    # !SECTION Widget Tools 
+    # !SECTION Widget Tools
diff --git a/python2.7libs/searcher/widgets/collapsedock.py b/python2.7libs/searcher/widgets/collapsedock.py
index cef9cfe..dde58df 100644
--- a/python2.7libs/searcher/widgets/collapsedock.py
+++ b/python2.7libs/searcher/widgets/collapsedock.py
@@ -1,4 +1,4 @@
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 
 class CollapsibleBox(QtWidgets.QWidget):