@@ -1,9 +1,9 @@
 # encoding: utf-8
 import os, re, types
-from AppKit import *
 from contextlib import contextmanager, nested
 from collections import namedtuple
 
+from .lib.cocoa import *
 from .util import _copy_attr, _copy_attrs, _flatten, trim_zeroes
 from .lib import geometry, pathmatics
 from .gfx.transform import Dimension
 
@@ -1,8 +1,6 @@
 # encoding: utf-8
 from contextlib import contextmanager
-from AppKit import *
-from Foundation import *
-from Quartz import *
+from ..lib.cocoa import *
 
 ### graphics context mgmt ###
 
 
@@ -1,8 +1,6 @@
 # encoding: utf-8
 import warnings
-from AppKit import *
-from Foundation import *
-from Quartz import *
+from ..lib.cocoa import *
 from math import pi, sin, cos, sqrt
 
 from plotdevice import DeviceError
 
@@ -3,9 +3,7 @@
 import re
 import json
 import warnings
-from AppKit import *
-from Foundation import *
-from Quartz import *
+from ..lib.cocoa import *
 
 from plotdevice import DeviceError
 from ..util import _copy_attr, _copy_attrs, _flatten, trim_zeroes, rsrc_path
 
@@ -2,9 +2,7 @@
 import os
 import re
 from contextlib import contextmanager
-from AppKit import *
-from Foundation import *
-from Quartz import *
+from ..lib.cocoa import *
 
 from plotdevice import DeviceError
 from ..util import _copy_attr, _copy_attrs
 
@@ -5,10 +5,7 @@
 import warnings
 import math
 from contextlib import contextmanager
-from AppKit import *
-from Foundation import *
-from Quartz import *
-from Quartz.PDFKit import *
+from ..lib.cocoa import *
 
 from plotdevice import DeviceError
 from ..util import _copy_attrs
 
@@ -4,9 +4,7 @@
 import json
 import warnings
 import math
-from AppKit import *
-from Foundation import *
-from Quartz import *
+from ..lib.cocoa import *
 
 from plotdevice import DeviceError
 from ..util import trim_zeroes
 
@@ -3,8 +3,7 @@
 from xml.parsers import expat
 from operator import itemgetter, attrgetter
 from plotdevice.util import odict, ddict
-from AppKit import *
-from Foundation import *
+from ..lib.cocoa import *
 
 from plotdevice import DeviceError, INTERNAL as DEFAULT
 from .atoms import TransformMixin, ColorMixin, EffectsMixin, StyleMixin, BoundsMixin, Grob
 
@@ -3,8 +3,7 @@
 import os
 import objc
 from glob import glob
-from Foundation import *
-from AppKit import *
+from ..lib.cocoa import *
 from PyObjCTools import AppHelper
 from .preferences import PlotDevicePreferencesController, get_default
 from . import bundle_path, set_timeout
@@ -13,8 +12,8 @@
 """
 
 class PlotDeviceAppDelegate(NSObject):
-    examplesMenu = objc.IBOutlet()
-    updatesMenu = objc.IBOutlet()
+    examplesMenu = IBOutlet()
+    updatesMenu = IBOutlet()
 
     def awakeFromNib(self):
         self._prefsController = None
@@ -77,14 +76,14 @@ def updateExamples(self):
             folders[cat].addItem_(item)
         self.examplesMenu.setHidden_(not pyfiles)
 
-    @objc.IBAction
+    @IBAction
     def newSketch_(self, sender):
         kind = ['sketch','anim','ottobot'][sender.tag()]
         doc = self.docFromTemplate_('TMPL:'+kind)
         if kind=='ottobot':
             AppHelper.callLater(0.1, doc.script.runScript)
 
-    @objc.IBAction
+    @IBAction
     def openExample_(self, sender):
         tmpl = sender.representedObject()
         self.docFromTemplate_(tmpl)
@@ -98,18 +97,18 @@ def docFromTemplate_(self, tmpl):
         doc.showWindows()
         return doc
 
-    @objc.IBAction
+    @IBAction
     def showPreferencesPanel_(self, sender):
         if self._prefsController is None:
             self._prefsController = PlotDevicePreferencesController.alloc().init()
         self._prefsController.showWindow_(sender)
 
-    @objc.IBAction
+    @IBAction
     def showHelp_(self, sender):
         url = NSURL.URLWithString_("http://plotdevice.io/doc")
         NSWorkspace.sharedWorkspace().openURL_(url)
 
-    @objc.IBAction
+    @IBAction
     def showSite_(self, sender):
         url = NSURL.URLWithString_("http://plotdevice.io/")
         NSWorkspace.sharedWorkspace().openURL_(url)
 
@@ -7,8 +7,7 @@
 import time
 import objc
 
-from Foundation import *
-from AppKit import *
+from ..lib.cocoa import *
 
 from .editor import OutputTextView, EditorView
 from .widgets import DashboardController, ExportSheet
@@ -114,14 +113,14 @@ def _refresh(self):
 # `file's owner' in PlotDeviceDocument.xib
 class ScriptController(NSWindowController):
     # main document window
-    graphicsView = objc.IBOutlet()
-    outputView = objc.IBOutlet()
-    editorView = objc.IBOutlet()
-    statusView = objc.IBOutlet()
+    graphicsView = IBOutlet()
+    outputView = IBOutlet()
+    editorView = IBOutlet()
+    statusView = IBOutlet()
 
     # auxiliary windows
-    dashboardController = objc.IBOutlet()
-    exportSheet = objc.IBOutlet()
+    dashboardController = IBOutlet()
+    exportSheet = IBOutlet()
 
     ## Properties
 
@@ -301,14 +300,14 @@ def shouldCloseDocument(self):
     # Running the script in the main window
     #
 
-    @objc.IBAction
+    @IBAction
     def runScript_(self, sender):
         # listens for cmd-r
         if self.vm.session:
             return NSBeep()
         self.runScript()
 
-    @objc.IBAction
+    @IBAction
     def runFullscreen_(self, sender):
         # listens for cmd-shift-r
         if not self.fullScreen:
@@ -456,13 +455,13 @@ def _ui_state(self):
     #
     # Exporting to file(s)
     #
-    @objc.IBAction
+    @IBAction
     def exportAsImage_(self, sender):
         if self.vm.session:
             return NSBeep()
         self.exportSheet.beginExport('image')
 
-    @objc.IBAction
+    @IBAction
     def exportAsMovie_(self, sender):
         if self.vm.session:
             return NSBeep()
@@ -514,7 +513,7 @@ def exportStatus(self, event):
     #
     # Interrupting the run
     #
-    @objc.IBAction
+    @IBAction
     def stopScript_(self, sender=None):
         # catch command-period
         if self.vm.session:
@@ -583,14 +582,14 @@ def crash(self):
     #
     # Pasteboards
     #
-    @objc.IBAction
+    @IBAction
     def copyImageAsPDF_(self, sender):
         pboard = NSPasteboard.generalPasteboard()
         # graphicsView implements the pboard delegate method to provide the data
         pboard.declareTypes_owner_([NSPDFPboardType,NSPostScriptPboardType,NSTIFFPboardType], self.graphicsView)
 
 
-    @objc.IBAction
+    @IBAction
     def printDocument_(self, sender):
         op = NSPrintOperation.printOperationWithView_printInfo_(self.graphicsView, self.printInfo())
         op.runOperationModalForWindow_delegate_didRunSelector_contextInfo_(
@@ -607,22 +606,22 @@ def printOperationDidRun_success_contextInfo_(self, op, success, info):
     #
     # Zoom commands, forwarding to the graphics view.
     #
-    @objc.IBAction
+    @IBAction
     def zoomIn_(self, sender):
         if self.fullScreen is not None: return
         self.graphicsView.zoomIn_(sender)
 
-    @objc.IBAction
+    @IBAction
     def zoomOut_(self, sender):
         if self.fullScreen is not None: return
         self.graphicsView.zoomOut_(sender)
 
-    @objc.IBAction
+    @IBAction
     def zoomToTag_(self, sender):
         if self.fullScreen is not None: return
         self.graphicsView.zoomTo_(sender.tag() / 100.0)
 
-    @objc.IBAction
+    @IBAction
     def zoomToFit_(self, sender):
         if self.fullScreen is not None: return
         self.graphicsView.zoomToFit_(sender)