diff --git a/gui/PFListPane.py b/gui/PFListPane.py
index 556b97638..c138e72b8 100644
--- a/gui/PFListPane.py
+++ b/gui/PFListPane.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 
diff --git a/gui/PFSearchBox.py b/gui/PFSearchBox.py
index ece5cef5f..b0337c2e1 100644
--- a/gui/PFSearchBox.py
+++ b/gui/PFSearchBox.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import gui.utils.colorUtils as colorUtils
 import gui.utils.drawUtils as drawUtils
diff --git a/gui/additionsPane.py b/gui/additionsPane.py
index a7a034032..503fc4135 100644
--- a/gui/additionsPane.py
+++ b/gui/additionsPane.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.boosterView import BoosterView
 from gui.droneView import DroneView
diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
index 066fc0c5f..c6c932b4b 100644
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -22,6 +22,7 @@ import os.path
 import zipfile
 from config import parsePath
 
+# noinspection PyPackageRequirements
 import wx
 
 import config
diff --git a/gui/boosterView.py b/gui/boosterView.py
index 110a04b04..3f0c08d59 100644
--- a/gui/boosterView.py
+++ b/gui/boosterView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.display as d
 import gui.globalEvents as GE
diff --git a/gui/builtinContextMenus/ammoPattern.py b/gui/builtinContextMenus/ammoPattern.py
index be2833d9e..e131bb1c6 100644
--- a/gui/builtinContextMenus/ammoPattern.py
+++ b/gui/builtinContextMenus/ammoPattern.py
@@ -1,5 +1,6 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py
index 54662f58d..3d51a1963 100644
--- a/gui/builtinContextMenus/amount.py
+++ b/gui/builtinContextMenus/amount.py
@@ -2,6 +2,7 @@ from gui.contextMenu import ContextMenu
 from eos.saveddata.fit import Fit as es_Fit
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from service.fit import Fit
 from eos.saveddata.cargo import Cargo as es_Cargo
diff --git a/gui/builtinContextMenus/cargo.py b/gui/builtinContextMenus/cargo.py
index 1f5ad4202..97ea7b8ab 100644
--- a/gui/builtinContextMenus/cargo.py
+++ b/gui/builtinContextMenus/cargo.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from service.fit import Fit
 
diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py
index cc2d99055..6c02d07b9 100644
--- a/gui/builtinContextMenus/changeAffectingSkills.py
+++ b/gui/builtinContextMenus/changeAffectingSkills.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 from eos.saveddata.character import Skill
diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py
index b2089e9c0..6fd1778c3 100644
--- a/gui/builtinContextMenus/damagePattern.py
+++ b/gui/builtinContextMenus/damagePattern.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/droneRemoveStack.py b/gui/builtinContextMenus/droneRemoveStack.py
index 8132a8fc9..b8e4b820b 100644
--- a/gui/builtinContextMenus/droneRemoveStack.py
+++ b/gui/builtinContextMenus/droneRemoveStack.py
@@ -1,5 +1,6 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/droneSplit.py b/gui/builtinContextMenus/droneSplit.py
index 2f2ec923e..77ba87e8a 100644
--- a/gui/builtinContextMenus/droneSplit.py
+++ b/gui/builtinContextMenus/droneSplit.py
@@ -2,6 +2,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
 from service.fit import Fit
+# noinspection PyPackageRequirements
 import wx
 
 
diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py
index d7b33658d..86553c73b 100644
--- a/gui/builtinContextMenus/factorReload.py
+++ b/gui/builtinContextMenus/factorReload.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py
index d262cb052..8c26a9ffe 100644
--- a/gui/builtinContextMenus/fighterAbilities.py
+++ b/gui/builtinContextMenus/fighterAbilities.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
diff --git a/gui/builtinContextMenus/implantSets.py b/gui/builtinContextMenus/implantSets.py
index 490f52ef2..994c0d607 100644
--- a/gui/builtinContextMenus/implantSets.py
+++ b/gui/builtinContextMenus/implantSets.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from service.implantSet import ImplantSets as s_ImplantSets
 from service.character import Character
diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py
index 400890b1a..fb8a70679 100644
--- a/gui/builtinContextMenus/itemRemove.py
+++ b/gui/builtinContextMenus/itemRemove.py
@@ -1,5 +1,6 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py
index 2ccc3d364..1b923ecf5 100644
--- a/gui/builtinContextMenus/itemStats.py
+++ b/gui/builtinContextMenus/itemStats.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 from gui.itemStats import ItemStatsDialog
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 from service.fit import Fit
 
diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py
index 3462410e5..389335f53 100644
--- a/gui/builtinContextMenus/metaSwap.py
+++ b/gui/builtinContextMenus/metaSwap.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index 4e0111493..ef0a8a742 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
index 71c1b2e33..849896111 100644
--- a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
diff --git a/gui/builtinContextMenus/openFit.py b/gui/builtinContextMenus/openFit.py
index fad0c2640..5a0a760f7 100644
--- a/gui/builtinContextMenus/openFit.py
+++ b/gui/builtinContextMenus/openFit.py
@@ -1,5 +1,6 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 from gui.shipBrowser import FitSelected
 
diff --git a/gui/builtinContextMenus/priceClear.py b/gui/builtinContextMenus/priceClear.py
index e61b7df7f..8cb1a5175 100644
--- a/gui/builtinContextMenus/priceClear.py
+++ b/gui/builtinContextMenus/priceClear.py
@@ -1,5 +1,6 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from service.market import Market
diff --git a/gui/builtinContextMenus/project.py b/gui/builtinContextMenus/project.py
index 0fcae7864..838b4e4fc 100644
--- a/gui/builtinContextMenus/project.py
+++ b/gui/builtinContextMenus/project.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from service.fit import Fit
 
diff --git a/gui/builtinContextMenus/shipJump.py b/gui/builtinContextMenus/shipJump.py
index b743201a3..40dda42c8 100644
--- a/gui/builtinContextMenus/shipJump.py
+++ b/gui/builtinContextMenus/shipJump.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
diff --git a/gui/builtinContextMenus/tacticalMode.py b/gui/builtinContextMenus/tacticalMode.py
index 62abf309d..679be45f3 100644
--- a/gui/builtinContextMenus/tacticalMode.py
+++ b/gui/builtinContextMenus/tacticalMode.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py
index f23125f43..c8224104b 100644
--- a/gui/builtinContextMenus/targetResists.py
+++ b/gui/builtinContextMenus/targetResists.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 from service.targetResists import TargetResists as svc_TargetResists
diff --git a/gui/builtinContextMenus/whProjector.py b/gui/builtinContextMenus/whProjector.py
index 0e3bfed93..d5883541f 100644
--- a/gui/builtinContextMenus/whProjector.py
+++ b/gui/builtinContextMenus/whProjector.py
@@ -1,6 +1,7 @@
 from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import gui.globalEvents as GE
+# noinspection PyPackageRequirements
 import wx
 from service.market import Market
 from service.fit import Fit
diff --git a/gui/builtinPreferenceViews/__init__.py b/gui/builtinPreferenceViews/__init__.py
index eb7f3c970..38beb0d0f 100644
--- a/gui/builtinPreferenceViews/__init__.py
+++ b/gui/builtinPreferenceViews/__init__.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 __all__ = ["pyfaGeneralPreferences", "pyfaHTMLExportPreferences", "pyfaUpdatePreferences",
diff --git a/gui/builtinPreferenceViews/dummyView.py b/gui/builtinPreferenceViews/dummyView.py
index fb46db87e..5bded0d05 100644
--- a/gui/builtinPreferenceViews/dummyView.py
+++ b/gui/builtinPreferenceViews/dummyView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.preferenceView import PreferenceView
 
diff --git a/gui/builtinPreferenceViews/pyfaCrestPreferences.py b/gui/builtinPreferenceViews/pyfaCrestPreferences.py
index 7a54dbc83..4a9208d0a 100644
--- a/gui/builtinPreferenceViews/pyfaCrestPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaCrestPreferences.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 from gui.preferenceView import PreferenceView
@@ -7,6 +8,7 @@ import gui.mainFrame
 
 from service.settings import CRESTSettings
 
+# noinspection PyPackageRequirements
 from wx.lib.intctrl import IntCtrl
 
 if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
diff --git a/gui/builtinPreferenceViews/pyfaGaugePreferences.py b/gui/builtinPreferenceViews/pyfaGaugePreferences.py
index 88c1e1313..c7d832a88 100644
--- a/gui/builtinPreferenceViews/pyfaGaugePreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGaugePreferences.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
+# noinspection PyPackageRequirements
 import wx
 import copy
 
diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 0e5a18f93..e63863f22 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 from gui.preferenceView import PreferenceView
diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
index c6428d8b7..01f00409d 100644
--- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import os
 
diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
index 8c93b1a5f..e20f8a01d 100644
--- a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 from gui.preferenceView import PreferenceView
diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
index 48e2a79cc..fcb3fe003 100644
--- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
+++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 from gui.preferenceView import PreferenceView
diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py
index a09b2ff91..6dab28404 100644
--- a/gui/builtinStatsViews/capacitorViewFull.py
+++ b/gui/builtinStatsViews/capacitorViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py
index 9c31fefe2..618ca52de 100644
--- a/gui/builtinStatsViews/firepowerViewFull.py
+++ b/gui/builtinStatsViews/firepowerViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.mainFrame
 from gui.statsView import StatsView
diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py
index 545b47c88..be69be316 100644
--- a/gui/builtinStatsViews/miningyieldViewFull.py
+++ b/gui/builtinStatsViews/miningyieldViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.mainFrame
 from gui.statsView import StatsView
diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py
index bb222d94a..d33459865 100644
--- a/gui/builtinStatsViews/priceViewFull.py
+++ b/gui/builtinStatsViews/priceViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py
index a285c04cb..9469084ee 100644
--- a/gui/builtinStatsViews/rechargeViewFull.py
+++ b/gui/builtinStatsViews/rechargeViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py
index 16f8cb5a5..d36f1fc24 100644
--- a/gui/builtinStatsViews/resistancesViewFull.py
+++ b/gui/builtinStatsViews/resistancesViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
index 8bd7bb37b..bff5dd0e1 100644
--- a/gui/builtinStatsViews/resourcesViewFull.py
+++ b/gui/builtinStatsViews/resourcesViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py
index aab2bf25e..bcdd2ca60 100644
--- a/gui/builtinStatsViews/targetingMiscViewFull.py
+++ b/gui/builtinStatsViews/targetingMiscViewFull.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.statsView import StatsView
 from gui.utils.numberFormatter import formatAmount
diff --git a/gui/builtinViewColumns/abilities.py b/gui/builtinViewColumns/abilities.py
index 5198743b0..69b7ece97 100644
--- a/gui/builtinViewColumns/abilities.py
+++ b/gui/builtinViewColumns/abilities.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 
+# noinspection PyPackageRequirements
 import wx
 from eos.saveddata.fighter import Fighter
 from gui.viewColumn import ViewColumn
diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py
index 14bb4e3ba..069328a32 100644
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from eos.saveddata.fighter import Fighter
 from gui.viewColumn import ViewColumn
diff --git a/gui/builtinViewColumns/ammoIcon.py b/gui/builtinViewColumns/ammoIcon.py
index 8c532dd32..7459db6a4 100644
--- a/gui/builtinViewColumns/ammoIcon.py
+++ b/gui/builtinViewColumns/ammoIcon.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 from gui.viewColumn import ViewColumn
+# noinspection PyPackageRequirements
 import wx
 from eos.saveddata.module import Module
 
diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py
index 26994a956..5996b0f74 100644
--- a/gui/builtinViewColumns/attributeDisplay.py
+++ b/gui/builtinViewColumns/attributeDisplay.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from gui.viewColumn import ViewColumn
diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py
index 32eca9c61..8c09a9fa3 100644
--- a/gui/builtinViewColumns/baseIcon.py
+++ b/gui/builtinViewColumns/baseIcon.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 from eos.saveddata.implant import Implant
 from eos.saveddata.drone import Drone
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index c1a291434..70d0c65a7 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -18,6 +18,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from eos.saveddata.cargo import Cargo
 from eos.saveddata.implant import Implant
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index b6a65c58d..5d0287375 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from eos.saveddata.mode import Mode
diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py
index 95fd3d931..f10335b37 100644
--- a/gui/builtinViewColumns/maxRange.py
+++ b/gui/builtinViewColumns/maxRange.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from eos.saveddata.mode import Mode
diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index 6540a8fa4..f5ba2c89a 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py
index c916c54c1..194aa594d 100644
--- a/gui/builtinViewColumns/price.py
+++ b/gui/builtinViewColumns/price.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from eos.saveddata.cargo import Cargo
diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py
index 0a139eca3..aa3f79ebe 100644
--- a/gui/builtinViewColumns/state.py
+++ b/gui/builtinViewColumns/state.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 
+# noinspection PyPackageRequirements
 import wx
 
 from eos.saveddata.fit import Fit
diff --git a/gui/builtinViews/emptyView.py b/gui/builtinViews/emptyView.py
index 5b19fa044..ebf667726 100644
--- a/gui/builtinViews/emptyView.py
+++ b/gui/builtinViews/emptyView.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import gui.globalEvents as GE
 from gui.chromeTabs import EVT_NOTEBOOK_PAGE_CHANGED
diff --git a/gui/builtinViews/entityEditor.py b/gui/builtinViews/entityEditor.py
index b77efe8a5..ecbe065c6 100644
--- a/gui/builtinViews/entityEditor.py
+++ b/gui/builtinViews/entityEditor.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 43e46d780..a06a77300 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -17,7 +17,9 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 import wx.lib.newevent
 import gui.mainFrame
 import gui.marketBrowser
diff --git a/gui/builtinViews/implantEditor.py b/gui/builtinViews/implantEditor.py
index 8b56833df..bb9c125e7 100644
--- a/gui/builtinViews/implantEditor.py
+++ b/gui/builtinViews/implantEditor.py
@@ -1,4 +1,6 @@
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 from wx.lib.buttons import GenBitmapButton
 
 from service.market import Market
diff --git a/gui/cachingImageList.py b/gui/cachingImageList.py
index 0762d1687..4bbef1e23 100644
--- a/gui/cachingImageList.py
+++ b/gui/cachingImageList.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 
diff --git a/gui/cargoView.py b/gui/cargoView.py
index 12197fb67..bacd5c8aa 100644
--- a/gui/cargoView.py
+++ b/gui/cargoView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.display as d
 from gui.builtinViewColumns.state import State
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 421ed8bbc..37855e46c 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -17,9 +17,12 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
+# noinspection PyPackageRequirements
 import wx.lib.newevent
+# noinspection PyPackageRequirements
 import wx.gizmos
 from gui.bitmapLoader import BitmapLoader
 from gui.contextMenu import ContextMenu
diff --git a/gui/characterSelection.py b/gui/characterSelection.py
index b63f87475..e85cd081b 100644
--- a/gui/characterSelection.py
+++ b/gui/characterSelection.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 import gui.globalEvents as GE
diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py
index b1fec7008..f5033baf3 100644
--- a/gui/chromeTabs.py
+++ b/gui/chromeTabs.py
@@ -17,7 +17,9 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 import wx.lib.newevent
 import gui.utils.colorUtils as colorUtils
 import gui.utils.drawUtils as drawUtils
@@ -1123,6 +1125,7 @@ class PFTabsContainer(wx.Panel):
             color = wx.Colour(0, 0, 0)
             brush = wx.Brush(color)
 
+            # noinspection PyPackageRequirements
             from Carbon.Appearance import kThemeBrushDialogBackgroundActive
             brush.MacSetTheme(kThemeBrushDialogBackgroundActive)
         else:
diff --git a/gui/commandView.py b/gui/commandView.py
index 4b5a03390..4a3850f19 100644
--- a/gui/commandView.py
+++ b/gui/commandView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.display as d
 import gui.globalEvents as GE
diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index 527535393..376a8b813 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import logging
 
diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py
index bb5a6e601..2f0a55e60 100644
--- a/gui/copySelectDialog.py
+++ b/gui/copySelectDialog.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 
+# noinspection PyPackageRequirements
 import wx
 
 
diff --git a/gui/crestFittings.py b/gui/crestFittings.py
index 40ce122e9..ff2ec8527 100644
--- a/gui/crestFittings.py
+++ b/gui/crestFittings.py
@@ -1,6 +1,7 @@
 import time
 import webbrowser
 import json
+# noinspection PyPackageRequirements
 import wx
 import requests
 
diff --git a/gui/display.py b/gui/display.py
index 0d9e0308f..71043f379 100644
--- a/gui/display.py
+++ b/gui/display.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 import sys
+# noinspection PyPackageRequirements
 import wx
 import gui.mainFrame
 from gui.viewColumn import ViewColumn
diff --git a/gui/droneView.py b/gui/droneView.py
index f49c0c293..b3836785c 100644
--- a/gui/droneView.py
+++ b/gui/droneView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 import gui.globalEvents as GE
diff --git a/gui/fighterView.py b/gui/fighterView.py
index 2ea1b9ff3..803707c37 100644
--- a/gui/fighterView.py
+++ b/gui/fighterView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 import gui.globalEvents as GE
diff --git a/gui/globalEvents.py b/gui/globalEvents.py
index 18f91d348..1c1cc7e38 100644
--- a/gui/globalEvents.py
+++ b/gui/globalEvents.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx.lib.newevent
 
 FitChanged, FIT_CHANGED = wx.lib.newevent.NewEvent()
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index 7b56c0ed0..059bd3fa7 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -21,6 +21,7 @@ import os
 import logging
 import imp
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/implantView.py b/gui/implantView.py
index 88211f381..12e27e241 100644
--- a/gui/implantView.py
+++ b/gui/implantView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.display as d
 import gui.marketBrowser as mb
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 9942ba41e..9e4145fff 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -23,8 +23,11 @@ import csv
 import sys
 import subprocess
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 import wx.html
+# noinspection PyPackageRequirements
 import wx.lib.mixins.listctrl as listmix
 
 import config
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 5f13807d3..665b4c603 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -22,13 +22,17 @@ import os.path
 import logging
 
 import sqlalchemy
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
+from wx._core import PyDeadObjectError
+# noinspection PyPackageRequirements
+from wx.lib.wordwrap import wordwrap
+# noinspection PyPackageRequirements
+from wx.lib.inspection import InspectionTool
 import time
 
 from codecs import open
-from wx._core import PyDeadObjectError
-
-from wx.lib.wordwrap import wordwrap
 
 import config
 
@@ -949,7 +953,6 @@ class MainFrame(wx.Frame):
             self.graphFrame.SetFocus()
 
     def openWXInspectTool(self, event):
-        from wx.lib.inspection import InspectionTool
         if not InspectionTool().initialized:
             InspectionTool().Init()
 
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 340a66e3a..da1b08772 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 import config
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index 4b3b8d55b..8b00a4378 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from service.market import Market
 from service.attribute import Attribute
diff --git a/gui/notesView.py b/gui/notesView.py
index f607efb0b..d4f8703cc 100644
--- a/gui/notesView.py
+++ b/gui/notesView.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/patternEditor.py b/gui/patternEditor.py
index 9d11a5ab9..ed63fd9a3 100644
--- a/gui/patternEditor.py
+++ b/gui/patternEditor.py
@@ -17,8 +17,10 @@
 # along with pyfa.    If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
+# noinspection PyPackageRequirements
 from wx.lib.intctrl import IntCtrl
 from gui.utils.clipboard import toClipboard, fromClipboard
 from gui.builtinViews.entityEditor import EntityEditor, BaseValidator
diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py
index 1d36d0d03..e6c5f12af 100644
--- a/gui/preferenceDialog.py
+++ b/gui/preferenceDialog.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from gui.preferenceView import PreferenceView
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/preferenceView.py b/gui/preferenceView.py
index 2f7b34bd8..5a9064ae2 100644
--- a/gui/preferenceView.py
+++ b/gui/preferenceView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 
diff --git a/gui/projectedView.py b/gui/projectedView.py
index 6560044a7..bfd5736ea 100644
--- a/gui/projectedView.py
+++ b/gui/projectedView.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 import gui.display as d
 import gui.globalEvents as GE
diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py
index 405e2a5d3..32c1e0485 100644
--- a/gui/propertyEditor.py
+++ b/gui/propertyEditor.py
@@ -1,9 +1,11 @@
 import csv
 import logging
 
+# noinspection PyPackageRequirements
 import wx
 
 try:
+    # noinspection PyPackageRequirements
     import wx.propgrid as wxpg
 except:
     if wx.VERSION < (2, 9):
diff --git a/gui/pyfatogglepanel.py b/gui/pyfatogglepanel.py
index db37216ba..71ccec124 100644
--- a/gui/pyfatogglepanel.py
+++ b/gui/pyfatogglepanel.py
@@ -21,6 +21,7 @@
 # Notes: leave the commented code as it is, those line will be removed someday
 ###########################################################################
 
+# noinspection PyPackageRequirements
 import wx
 from gui.bitmapLoader import BitmapLoader
 
diff --git a/gui/pygauge.py b/gui/pygauge.py
index 602304e13..6605d19f8 100644
--- a/gui/pygauge.py
+++ b/gui/pygauge.py
@@ -11,6 +11,7 @@ PyfaGauge is a generic Gauge implementation tailored for PYFA (Python Fitting As
 It uses the easeOutQuad equation from caurina.transitions.Tweener to do the animation stuff
 """
 
+# noinspection PyPackageRequirements
 import wx
 import copy
 
diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py
index 44eadd9c3..dedf0914e 100644
--- a/gui/resistsEditor.py
+++ b/gui/resistsEditor.py
@@ -17,6 +17,7 @@
 # along with pyfa.    If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 from service.targetResists import TargetResists
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/setEditor.py b/gui/setEditor.py
index 0118fbe03..3a1d2874a 100644
--- a/gui/setEditor.py
+++ b/gui/setEditor.py
@@ -18,6 +18,7 @@
 # =============================================================================
 
 import logging
+# noinspection PyPackageRequirements
 import wx
 
 from service.implantSet import ImplantSets
diff --git a/gui/sfBrowserItem.py b/gui/sfBrowserItem.py
index 047c04bc6..52989c932 100644
--- a/gui/sfBrowserItem.py
+++ b/gui/sfBrowserItem.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import gui.utils.drawUtils as drawUtils
 
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index a9e12a110..a0302f74b 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -3,7 +3,9 @@
 import re
 import time
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 from wx.lib.buttons import GenBitmapButton
 
 from service.fit import Fit
diff --git a/gui/statsPane.py b/gui/statsPane.py
index 5d20f22ef..f1ea90e22 100644
--- a/gui/statsPane.py
+++ b/gui/statsPane.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
 
 from service.fit import Fit
diff --git a/gui/updateDialog.py b/gui/updateDialog.py
index 155d5a6a9..10d978a1f 100644
--- a/gui/updateDialog.py
+++ b/gui/updateDialog.py
@@ -17,7 +17,9 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx
+# noinspection PyPackageRequirements
 import dateutil.parser
 from service.settings import UpdateSettings as svc_UpdateSettings
 
diff --git a/gui/utils/animUtils.py b/gui/utils/animUtils.py
index cefd3938b..d30375fe2 100644
--- a/gui/utils/animUtils.py
+++ b/gui/utils/animUtils.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import gui.utils.colorUtils as colorUtils
 
diff --git a/gui/utils/clipboard.py b/gui/utils/clipboard.py
index 4fa05e1f3..2ca2345e4 100644
--- a/gui/utils/clipboard.py
+++ b/gui/utils/clipboard.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 
 
diff --git a/gui/utils/colorUtils.py b/gui/utils/colorUtils.py
index a8d560159..aeeb508c8 100644
--- a/gui/utils/colorUtils.py
+++ b/gui/utils/colorUtils.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import math
 
diff --git a/gui/utils/drawUtils.py b/gui/utils/drawUtils.py
index 559dac395..185cbb109 100644
--- a/gui/utils/drawUtils.py
+++ b/gui/utils/drawUtils.py
@@ -1,3 +1,4 @@
+# noinspection PyPackageRequirements
 import wx
 import gui.utils.colorUtils as colorUtils
 
diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py
index 194db5a6b..5cdec552f 100644
--- a/gui/utils/exportHtml.py
+++ b/gui/utils/exportHtml.py
@@ -1,5 +1,6 @@
 import threading
 import time
+# noinspection PyPackageRequirements
 import wx
 from service.settings import HTMLExportSettings
 from service.fit import Fit
diff --git a/gui/utils/fonts.py b/gui/utils/fonts.py
index eb2dd95f5..359957147 100644
--- a/gui/utils/fonts.py
+++ b/gui/utils/fonts.py
@@ -3,6 +3,7 @@ Font file to handle the differences in font calculations between
 different wxPython versions
 '''
 
+# noinspection PyPackageRequirements
 import wx
 
 if 'wxMac' in wx.PlatformInfo:
diff --git a/gui/viewColumn.py b/gui/viewColumn.py
index cd13055bb..c047ebece 100644
--- a/gui/viewColumn.py
+++ b/gui/viewColumn.py
@@ -17,6 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
+# noinspection PyPackageRequirements
 import wx