diff --git a/Boxer.xcodeproj/project.pbxproj b/Boxer.xcodeproj/project.pbxproj
index 2f4a287cc..0ee4eb246 100644
--- a/Boxer.xcodeproj/project.pbxproj
+++ b/Boxer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -47,6 +47,8 @@
 		5514503A24BE8DE60002CE28 /* envelope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5514503824BE8DE50002CE28 /* envelope.cpp */; };
 		5514503D24BE8FB90002CE28 /* program_autotype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5514503B24BE8FB90002CE28 /* program_autotype.cpp */; };
 		5514503E24BE8FB90002CE28 /* program_autotype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5514503B24BE8FB90002CE28 /* program_autotype.cpp */; };
+		55215F452AD22FD8007C7C68 /* MT32LCDDisplay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55215F442AD22FD8007C7C68 /* MT32LCDDisplay.swift */; };
+		55215F462AD22FD8007C7C68 /* MT32LCDDisplay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55215F442AD22FD8007C7C68 /* MT32LCDDisplay.swift */; };
 		55220E3824CFFF8C00A6736A /* BXShaderParametersWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 058BC52324C27B790078C244 /* BXShaderParametersWindowController.m */; };
 		55220E3924CFFF8C00A6736A /* BXShadersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 058BC51F24C27B770078C244 /* BXShadersModel.swift */; };
 		55220E3A24CFFF8C00A6736A /* BXShadersModel+OpenEmu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 058BC52124C27B780078C244 /* BXShadersModel+OpenEmu.swift */; };
@@ -425,7 +427,6 @@
 		9F2D30AF15B8233800FAE848 /* BXCoalfaceAudio.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F34BE3E142B700100A69FAF /* BXCoalfaceAudio.mm */; };
 		9F2D30B015B8233800FAE848 /* BXEmulator+BXAudio.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F34BE5E142B851700A69FAF /* BXEmulator+BXAudio.mm */; };
 		9F2D30B115B8233800FAE848 /* BXBaseAppController+BXSupportFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F34BE61142B917100A69FAF /* BXBaseAppController+BXSupportFiles.m */; };
-		9F2D30B215B8233800FAE848 /* BXMT32LCDDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FBEC4EF142CE8300016964A /* BXMT32LCDDisplay.m */; };
 		9F2D30B315B8233800FAE848 /* BXMIDISynth.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F902C23142E183500843B01 /* BXMIDISynth.m */; };
 		9F2D30B415B8233800FAE848 /* BXEmulatedMT32.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F902C26142E198100843B01 /* BXEmulatedMT32.mm */; };
 		9F2D30B515B8233800FAE848 /* BXExternalMIDIDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F902C29142E199100843B01 /* BXExternalMIDIDevice.m */; };
@@ -763,7 +764,6 @@
 		9FBC3C780F56E0D7001811F2 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FBC3C760F56E0D7001811F2 /* AudioUnit.framework */; };
 		9FBC3C790F56E0D7001811F2 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FBC3C770F56E0D7001811F2 /* CoreMIDI.framework */; };
 		9FBD321710E5144C00031CB6 /* Brand.png in Resources */ = {isa = PBXBuildFile; fileRef = 9FBD321610E5144C00031CB6 /* Brand.png */; };
-		9FBEC4F0142CE8300016964A /* BXMT32LCDDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FBEC4EF142CE8300016964A /* BXMT32LCDDisplay.m */; };
 		9FBF66AF11F35ADD00DAAB9A /* ADBSingleFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FBF66AE11F35ADD00DAAB9A /* ADBSingleFileTransfer.m */; };
 		9FC1620E119E9AD700705EA5 /* BXCursorFadeAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FC1620D119E9AD700705EA5 /* BXCursorFadeAnimation.m */; };
 		9FC2F84013D60FBD00BD4F6B /* BXDualActionControllerProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FC2F83F13D60FBD00BD4F6B /* BXDualActionControllerProfile.m */; };
@@ -1092,6 +1092,7 @@
 		5514503B24BE8FB90002CE28 /* program_autotype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = program_autotype.cpp; sourceTree = "<group>"; };
 		5514503C24BE8FB90002CE28 /* program_autotype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = program_autotype.h; sourceTree = "<group>"; };
 		551B793625593573006C57CE /* URL+ADBFilesystemHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+ADBFilesystemHelpers.swift"; sourceTree = "<group>"; };
+		55215F442AD22FD8007C7C68 /* MT32LCDDisplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MT32LCDDisplay.swift; sourceTree = "<group>"; };
 		5529311E252AF0DA0069EB35 /* soft_limiter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = soft_limiter.h; sourceTree = "<group>"; };
 		55419B67255A2F1400A779B2 /* URL+ADBQuickLookHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+ADBQuickLookHelpers.swift"; sourceTree = "<group>"; };
 		55419B73255A7FFA00A779B2 /* URL+ADBAliasHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+ADBAliasHelpers.swift"; sourceTree = "<group>"; };
@@ -1898,8 +1899,6 @@
 		9FBC3C770F56E0D7001811F2 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		9FBC3CB10F56E32C001811F2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Info.plist; sourceTree = "<group>"; };
 		9FBD321610E5144C00031CB6 /* Brand.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brand.png; sourceTree = "<group>"; };
-		9FBEC4EE142CE8300016964A /* BXMT32LCDDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXMT32LCDDisplay.h; sourceTree = "<group>"; };
-		9FBEC4EF142CE8300016964A /* BXMT32LCDDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BXMT32LCDDisplay.m; sourceTree = "<group>"; };
 		9FBF66AD11F35ADD00DAAB9A /* ADBSingleFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADBSingleFileTransfer.h; sourceTree = "<group>"; };
 		9FBF66AE11F35ADD00DAAB9A /* ADBSingleFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADBSingleFileTransfer.m; sourceTree = "<group>"; usesTabs = 1; };
 		9FBF66FC11F376B900DAAB9A /* ADBOperationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADBOperationDelegate.h; sourceTree = "<group>"; };
@@ -2910,8 +2909,7 @@
 				9F57684815DA27A300B50500 /* BXHUDSpinningProgressIndicator.m */,
 				9F60B0DA13AA418300F06BB1 /* BXCollectionItemView.h */,
 				9F60B0DB13AA418300F06BB1 /* BXCollectionItemView.m */,
-				9FBEC4EE142CE8300016964A /* BXMT32LCDDisplay.h */,
-				9FBEC4EF142CE8300016964A /* BXMT32LCDDisplay.m */,
+				55215F442AD22FD8007C7C68 /* MT32LCDDisplay.swift */,
 				9FC1620C119E9AD700705EA5 /* BXCursorFadeAnimation.h */,
 				9FC1620D119E9AD700705EA5 /* BXCursorFadeAnimation.m */,
 			);
@@ -4305,6 +4303,7 @@
 				9F0F2B9512AD3C8500CD7078 /* ADBFileTransferSet.m in Sources */,
 				9F444FCC12AEA28700A2D405 /* ADBOperationSet.m in Sources */,
 				9F444FFF12AEBE5200A2D405 /* BXDriveBundleImport.m in Sources */,
+				55215F452AD22FD8007C7C68 /* MT32LCDDisplay.swift in Sources */,
 				9F44500212AEC0FC00A2D405 /* BXSimpleDriveImport.m in Sources */,
 				5514502224BE81E00002CE28 /* ppscale.c in Sources */,
 				9F2120F813015653002AB1B7 /* BXShelfArt.m in Sources */,
@@ -4363,7 +4362,6 @@
 				9F34BE40142B700100A69FAF /* BXCoalfaceAudio.mm in Sources */,
 				9F34BE5F142B851800A69FAF /* BXEmulator+BXAudio.mm in Sources */,
 				9F34BE62142B917100A69FAF /* BXBaseAppController+BXSupportFiles.m in Sources */,
-				9FBEC4F0142CE8300016964A /* BXMT32LCDDisplay.m in Sources */,
 				9F902C24142E183500843B01 /* BXMIDISynth.m in Sources */,
 				55DB150427EDA2C70024AE9E /* program_boot.cpp in Sources */,
 				9F902C27142E198100843B01 /* BXEmulatedMT32.mm in Sources */,
@@ -4589,6 +4587,7 @@
 				9F2D2FA415B8233800FAE848 /* BXCloseAlert.m in Sources */,
 				9F2D2FA515B8233800FAE848 /* NSAlert+BXAlert.m in Sources */,
 				9F2D2FA615B8233800FAE848 /* BXHelpMenuController.m in Sources */,
+				55215F462AD22FD8007C7C68 /* MT32LCDDisplay.swift in Sources */,
 				9F2D2FA715B8233800FAE848 /* NSWorkspace+ADBMountedVolumes.m in Sources */,
 				9F2D2FA815B8233800FAE848 /* BXGamebox.m in Sources */,
 				9F2D2FA915B8233800FAE848 /* BXEmulator+BXDOSFileSystem.mm in Sources */,
@@ -4823,7 +4822,6 @@
 				9F2D30AF15B8233800FAE848 /* BXCoalfaceAudio.mm in Sources */,
 				9F2D30B015B8233800FAE848 /* BXEmulator+BXAudio.mm in Sources */,
 				9F2D30B115B8233800FAE848 /* BXBaseAppController+BXSupportFiles.m in Sources */,
-				9F2D30B215B8233800FAE848 /* BXMT32LCDDisplay.m in Sources */,
 				9F2D30B315B8233800FAE848 /* BXMIDISynth.m in Sources */,
 				9F2D30B415B8233800FAE848 /* BXEmulatedMT32.mm in Sources */,
 				5557480C208FA8040045E635 /* sn76496.cpp in Sources */,
diff --git a/Boxer/BXMT32LCDDisplay.h b/Boxer/BXMT32LCDDisplay.h
deleted file mode 100644
index bbdf90a45..000000000
--- a/Boxer/BXMT32LCDDisplay.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
- Copyright (c) 2013 Alun Bestor and contributors. All rights reserved.
- This source file is released under the GNU General Public License 2.0. A full copy of this license
- can be found in this XCode project at Resources/English.lproj/BoxerHelp/pages/legalese.html, or read
- online at [http://www.gnu.org/licenses/gpl-2.0.txt].
- */
-
-
-#import <Cocoa/Cocoa.h>
-
-/// BXMT32LCDDisplay imitates, as the name suggests, the LCD display on a Roland MT-32 Sound Module.
-/// It is used for displaying messages sent by the games to the emulated MT-32. (Many Sierra games
-/// would send cheeky messages to it on startup.)
-///
-/// This field can only display ASCII characters, as that was all the MT-32's display could handle.
-/// Non-ASCII characters will be drawn as empty space.
-@interface BXMT32LCDDisplay : NSTextField
-
-/// The image containing glyph data for the pixel font.
-- (NSImage *) pixelFont;
-
-/// The mask image to use for the LCD pixel grid.
-/// This will be drawn in for 20 character places.
-- (NSImage *) pixelGrid;
-
-/// The background color of the field.
-- (NSColor *) screenColor;
-
-/// The background color of the LCD pixel grid.
-- (NSColor *) gridColor;
-
-/// The colour of lit LCD pixels upon the grid.
-- (NSColor *) pixelColor;
-
-/// The inner shadow of the screen. 
-- (NSShadow *) innerShadow;
-
-/// The lighting effects applied on top of the screen.
-- (NSGradient *) screenLighting;
-
-@end
diff --git a/Boxer/BXMT32LCDDisplay.m b/Boxer/BXMT32LCDDisplay.m
deleted file mode 100644
index a914343c5..000000000
--- a/Boxer/BXMT32LCDDisplay.m
+++ /dev/null
@@ -1,181 +0,0 @@
-/* 
- Copyright (c) 2013 Alun Bestor and contributors. All rights reserved.
- This source file is released under the GNU General Public License 2.0. A full copy of this license
- can be found in this XCode project at Resources/English.lproj/BoxerHelp/pages/legalese.html, or read
- online at [http://www.gnu.org/licenses/gpl-2.0.txt].
- */
-
-#import "BXMT32LCDDisplay.h"
-#import "NSShadow+ADBShadowExtensions.h"
-#import "NSImage+ADBImageEffects.h"
-#import "NSBezierPath+MCAdditions.h"
-#import "ADBGeometry.h"
-
-
-@implementation BXMT32LCDDisplay
-
-- (NSImage *) pixelFont
-{
-    return [NSImage imageNamed: @"MT32ScreenDisplay/MT32LCDFontTemplate"];
-}
-
-- (NSImage *) pixelGrid
-{
-    return [NSImage imageNamed: @"MT32ScreenDisplay/MT32LCDGridTemplate"];
-}
-
-- (NSColor *) screenColor
-{   
-    return [NSColor colorNamed: @"MT32ScreenDisplay/screenColor"];
-}
-
-- (NSColor *) frameColor
-{
-    return [NSColor colorNamed: @"MT32ScreenDisplay/frameColor"];
-}
-
-- (NSColor *) gridColor
-{
-    return [NSColor colorNamed: @"MT32ScreenDisplay/gridColor"];
-}
-
-- (NSColor *) pixelColor
-{
-    return [NSColor colorNamed: @"MT32ScreenDisplay/pixelColor"];
-}
-
-- (NSShadow *) innerShadow
-{
-    return [NSShadow shadowWithBlurRadius: 10.0
-                                   offset: NSMakeSize(0, -2.0)
-                                    color: [NSColor colorNamed: @"MT32ScreenDisplay/innerShadowColor"]];
-}
-
-- (NSGradient *) screenLighting
-{
-    NSGradient *lighting = [[NSGradient alloc] initWithColorsAndLocations:
-                            [NSColor colorWithCalibratedWhite: 1.0 alpha: 0.10], 0.0,
-                            [NSColor colorWithCalibratedWhite: 1.0 alpha: 0.07], 0.5,
-                            [NSColor clearColor], 0.55,
-                            nil];
-    return lighting;
-}
-
-- (void) drawRect: (NSRect)dirtyRect
-{
-    NSString *charsToDisplay = [[self stringValue] stringByPaddingToLength: 20
-                                                                withString: @" "
-                                                           startingAtIndex: 0];
-    
-    NSImage *fontTemplate = [self pixelFont];
-    NSImage *gridTemplate = [self pixelGrid];
-    
-    NSShadow *screenShadow  = [self innerShadow];
-    NSColor *screenColor    = [self screenColor];
-    
-    NSBezierPath *screenPath = [NSBezierPath bezierPathWithRoundedRect: [self bounds]
-                                                               xRadius: 4.0f
-                                                               yRadius: 4.0f];
-    
-    
-    //First, draw the screen itself
-    [NSGraphicsContext saveGraphicsState];
-        [screenColor set];
-        [screenPath fill];
-    [NSGraphicsContext restoreGraphicsState];
-    
-    NSColor *gridColor  = [self gridColor];
-    NSColor *glyphColor = [self pixelColor];
-    
-    
-    
-    NSSize characterSize = [gridTemplate size];
-    NSUInteger characterSpacing = 3;
-    
-    NSSize glyphSize = NSMakeSize(5, 9);
-    unichar firstGlyph = '!';
-    
-    NSRect gridRect = NSMakeRect(0, 0,
-                                 (characterSize.width + characterSpacing) * 19 + characterSize.width,
-                                 characterSize.height);
-    
-    gridRect = centerInRect(gridRect, [self bounds]);
-    gridRect.origin = integralPoint(gridRect.origin);
-    
-    
-    NSRect fontTemplateRect = NSMakeRect(0, 0, [fontTemplate size].width, [fontTemplate size].height);
-    NSRect gridTemplateRect = NSMakeRect(0, 0, [gridTemplate size].width, [gridTemplate size].height);
-    
-    NSRect characterRect    = NSMakeRect(gridRect.origin.x,
-                                         gridRect.origin.y,
-                                         characterSize.width,
-                                         characterSize.height);
-    
-    NSImage *grid = [gridTemplate imageFilledWithColor: gridColor
-                                                atSize: characterSize];
-    
-    NSUInteger i;
-    
-    for (i = 0; i < 20; i++)
-    {
-        //First, draw the background grid for this character
-        [grid drawInRect: characterRect
-                fromRect: NSZeroRect
-               operation: NSCompositingOperationSourceOver
-                fraction: 1.0f
-          respectFlipped: YES
-                   hints: nil];
-        
-        //Next, draw the glyph to show in this grid, if it's within
-        //the range of our drawable characters
-        unichar c = [charsToDisplay characterAtIndex: i];
-        NSInteger glyphOffset = c - firstGlyph;
-        
-        //The place in the font image to grab the glyph from
-        NSRect glyphRect = NSMakeRect(glyphOffset * glyphSize.width, 0,
-                                      glyphSize.width, glyphSize.height);
-        
-        //Only bother drawing the character if it's represented in our glyph image.
-        if (NSContainsRect(fontTemplateRect, glyphRect))
-        {
-            NSImage *maskedGlyph = [gridTemplate copy];
-            
-            //First, use the grid to mask the glyph
-            [maskedGlyph lockFocus];
-                //Disable interpolation to ensure crisp scaling when we redraw the glyph.
-                [[NSGraphicsContext currentContext] setImageInterpolation: NSImageInterpolationNone];
-                [fontTemplate drawInRect: gridTemplateRect
-                                fromRect: glyphRect
-                               operation: NSCompositingOperationDestinationIn
-                                fraction: 1.0f
-                          respectFlipped: YES
-                                   hints: nil];
-            [maskedGlyph unlockFocus];
-            
-            //Then, draw the masked glyph into the itself
-            NSImage *tintedGlyph = [maskedGlyph imageFilledWithColor: glyphColor
-                                                              atSize: NSZeroSize];
-            
-            [tintedGlyph drawInRect: characterRect
-                           fromRect: NSZeroRect
-                          operation: NSCompositingOperationSourceOver
-                           fraction: 1.0f
-                     respectFlipped: YES
-                              hints: nil];
-        }
-            
-        characterRect.origin.x += characterSize.width + characterSpacing;
-    }
-    
-    
-    //Finally, draw the shadowing and lighting effects and the frame
-    [[NSGraphicsContext currentContext] saveGraphicsState];
-        [screenPath fillWithInnerShadow: screenShadow];
-        [[self frameColor] setStroke];
-        [screenPath setLineWidth: 2.0f];
-        [screenPath strokeInside];
-        [[self screenLighting] drawInBezierPath: screenPath angle: 80.0f];
-    [[NSGraphicsContext currentContext] restoreGraphicsState];
-}
-
-@end
diff --git a/Boxer/Boxer-Bridging-Header.h b/Boxer/Boxer-Bridging-Header.h
index e372b960d..81c8bef1f 100644
--- a/Boxer/Boxer-Bridging-Header.h
+++ b/Boxer/Boxer-Bridging-Header.h
@@ -6,3 +6,7 @@
 #import "BXFileTypes.h"
 #import "NSError+ADBErrorHelpers.h"
 #import "RegexKitLite.h" //FIXME: we shouldn't introduce dependencies on 3rd-party libraries.
+#import "NSShadow+ADBShadowExtensions.h"
+#import "NSImage+ADBImageEffects.h"
+#import "NSBezierPath+MCAdditions.h"
+#import "ADBGeometry.h"
diff --git a/Boxer/MT32LCDDisplay.swift b/Boxer/MT32LCDDisplay.swift
new file mode 100644
index 000000000..6d57e21ec
--- /dev/null
+++ b/Boxer/MT32LCDDisplay.swift
@@ -0,0 +1,137 @@
+//
+//  MT32LCDDisplay.swift
+//  Boxer
+//
+//  Created by C.W. Betts on 10/7/23.
+//  Copyright © 2023 Alun Bestor and contributors. All rights reserved.
+//
+
+import Cocoa
+
+/// BXMT32LCDDisplay imitates, as the name suggests, the LCD display on a Roland MT-32 Sound Module.
+/// It is used for displaying messages sent by the games to the emulated MT-32. (Many Sierra games
+/// would send cheeky messages to it on startup.)
+///
+/// This field can only display ASCII characters, as that was all the MT-32's display could handle.
+/// Non-ASCII characters will be drawn as empty space.
+class MT32LCDDisplay : NSTextField {
+    /// The image containing glyph data for the pixel font.
+    private var pixelFont: NSImage {
+        return NSImage(resource: ImageResource.MT32ScreenDisplay.mt32LCDFontTemplate)
+    }
+    
+    /// The mask image to use for the LCD pixel grid.
+    /// This will be drawn in for 20 character places.
+    private var pixelGrid: NSImage {
+        return NSImage(resource: ImageResource.MT32ScreenDisplay.mt32LCDGridTemplate)
+    }
+    
+    /// The background color of the field.
+    private var screenColor: NSColor {
+        return NSColor(resource: ColorResource.MT32ScreenDisplay.screen)
+    }
+
+    private var frameColor: NSColor {
+        return NSColor(resource: ColorResource.MT32ScreenDisplay.frame)
+    }
+
+    /// The background color of the LCD pixel grid.
+    private var gridColor: NSColor {
+        return NSColor(resource: ColorResource.MT32ScreenDisplay.grid)
+    }
+
+    /// The colour of lit LCD pixels upon the grid.
+    private var pixelColor: NSColor {
+        return NSColor(resource: ColorResource.MT32ScreenDisplay.pixel)
+    }
+    
+    /// The inner shadow of the screen.
+    private var innerShadow: NSShadow {
+        return NSShadow(blurRadius: 10, offset: NSSize(width: 0, height: -2.0), color: NSColor(resource: ColorResource.MT32ScreenDisplay.innerShadow))
+    }
+    
+    /// The lighting effects applied on top of the screen.
+    private var screenLighting: NSGradient {
+        return NSGradient(colorsAndLocations: (NSColor(calibratedWhite: 1.0, alpha: 0.10), 0.0), (NSColor(calibratedWhite: 1.0, alpha: 0.07), 0.5), (NSColor.clear, 0.55))!
+    }
+    
+    override func draw(_ dirtyRect: NSRect) {
+        let charsToDisplay = stringValue.padding(toLength: 20, withPad: " ", startingAt: 0)
+        
+        let fontTemplate = pixelFont
+        let gridTemplate = pixelGrid
+        
+        let screenShadow = innerShadow
+        let screenColor = self.screenColor
+        
+        let screenPath = NSBezierPath(roundedRect: bounds, xRadius: 4, yRadius: 4)
+        
+        //First, draw the screen itself
+        NSGraphicsContext.saveGraphicsState()
+            screenColor.set()
+            screenPath.fill()
+        NSGraphicsContext.restoreGraphicsState()
+
+        let gridColor = self.gridColor
+        let glyphColor = self.pixelColor
+        
+        let characterSize = gridTemplate.size
+        let characterSpacing = 3
+        
+        let glyphSize = NSSize(width: 5, height: 9)
+        let firstGlyph: Character = "!"
+        
+        var gridRect = NSRect(origin: .zero, size: CGSize(width: (characterSize.width + CGFloat(characterSpacing)) * 19 + characterSize.width, height: characterSize.height))
+        
+        gridRect = centerInRect(gridRect, bounds)
+        gridRect.origin = integralPoint(gridRect.origin)
+        
+        let fontTemplateRect = NSRect(origin: .zero, size: fontTemplate.size)
+        let gridTemplateRect = NSRect(origin: .zero, size: gridTemplate.size)
+        
+        var characterRect = NSRect(origin: gridRect.origin, size: characterSize)
+        
+        let grid = gridTemplate.imageFilled(with: gridColor, at: characterSize)
+        
+        for c in charsToDisplay {
+            //First, draw the background grid for this character
+            grid.draw(in: characterRect, from: .zero, operation: .sourceOver, fraction: 1, respectFlipped: true, hints: nil)
+            
+            //Next, draw the glyph to show in this grid, if it's within
+            //the range of our drawable characters
+            let glyphOffset = Int(c.asciiValue ?? 0) - Int(firstGlyph.asciiValue!)
+            
+            //The place in the font image to grab the glyph from
+            let glyphRect = NSRect(x: CGFloat(glyphOffset) * glyphSize.width, y: 0,
+                                   width: glyphSize.width, height: glyphSize.height)
+
+            //Only bother drawing the character if it's represented in our glyph image.
+            if NSContainsRect(fontTemplateRect, glyphRect) {
+                let maskedGlyph = gridTemplate.copy() as! NSImage
+                
+                //First, use the grid to mask the glyph
+                maskedGlyph.lockFocus()
+                //Disable interpolation to ensure crisp scaling when we redraw the glyph.
+                NSGraphicsContext.current?.imageInterpolation = .none
+                fontTemplate.draw(in: gridTemplateRect, from: glyphRect, operation: .destinationIn, fraction: 1, respectFlipped: true, hints: nil)
+                maskedGlyph.unlockFocus()
+                
+                //Then, draw the masked glyph into the itself
+                let tintedGlyph = maskedGlyph.imageFilled(with: glyphColor, at: .zero)
+                
+                tintedGlyph.draw(in: characterRect, from: .zero, operation: .sourceOver, fraction: 1, respectFlipped: true, hints: nil)
+            }
+            
+            characterRect.origin.x += characterSize.width + CGFloat(characterSpacing)
+        }
+        
+        //Finally, draw the shadowing and lighting effects and the frame
+        NSGraphicsContext.current?.saveGraphicsState()
+        screenPath.fill(withInnerShadow: screenShadow)
+        frameColor.setStroke()
+        screenPath.lineWidth = 2
+        screenPath.strokeInside()
+        screenLighting.draw(in: screenPath, angle: 80)
+        NSGraphicsContext.current?.restoreGraphicsState()
+    }
+}
diff --git a/Resources/Base.lproj/Bezel.xib b/Resources/Base.lproj/Bezel.xib
index 9d57c3daf..ce414df12 100644
--- a/Resources/Base.lproj/Bezel.xib
+++ b/Resources/Base.lproj/Bezel.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -36,7 +36,7 @@
             <rect key="frame" x="0.0" y="0.0" width="391" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="23" width="354" height="44"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="6">
@@ -53,7 +53,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="300" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="8" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="8" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="12" width="260" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[386 speed (3000 cycles)]" id="9">
@@ -85,7 +85,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="240" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="15" width="200" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[100% throttle]" id="27">
@@ -107,7 +107,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="30" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="30" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Drive D added]" id="31">
@@ -116,7 +116,7 @@ Cmd+click to access the menu bar.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="67" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="67" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="186" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="68">
@@ -136,7 +136,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="38" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="38" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Drive D ejected]" id="43">
@@ -150,7 +150,7 @@ Cmd+click to access the menu bar.</string>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="EjectTemplate" id="42" customClass="BXHUDImageCell"/>
                 </imageView>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="69" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="69" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="186" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="70">
@@ -165,7 +165,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="46" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="46" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Drive D imported]" id="47">
@@ -179,7 +179,7 @@ Cmd+click to access the menu bar.</string>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="48" customClass="BXHUDImageCell"/>
                 </imageView>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="71" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="71" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="186" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="72">
@@ -194,7 +194,7 @@ Cmd+click to access the menu bar.</string>
             <rect key="frame" x="0.0" y="0.0" width="340" height="128"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="52" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="52" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="64" width="306" height="44"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="53">
@@ -205,7 +205,7 @@ to joystick input.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="55" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="55" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="306" height="36"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="56">
@@ -246,7 +246,7 @@ joystick control within the game.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="75" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="75" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Drive D swapped]" id="78">
@@ -255,7 +255,7 @@ joystick control within the game.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="74" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="74" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="186" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="79">
@@ -285,7 +285,7 @@ joystick control within the game.</string>
             <rect key="frame" x="0.0" y="0.0" width="423" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="86" customClass="BXMT32LCDDisplay">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="86" customClass="MT32LCDDisplay" customModule="Boxer" customModuleProvider="target">
                     <rect key="frame" x="20" y="20" width="380" height="47"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="INSERT BUCKAZOID" id="87">
@@ -295,12 +295,13 @@ joystick control within the game.</string>
                     </textFieldCell>
                 </textField>
             </subviews>
+            <point key="canvasLocation" x="14" y="135"/>
         </customView>
         <customView id="89" userLabel="MT-32 Missing Bezel" customClass="BXBezelView">
             <rect key="frame" x="0.0" y="0.0" width="340" height="128"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="90" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="90" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="42" width="306" height="66"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="MT-32 ROMs are required to play this game’s music correctly." id="93">
@@ -309,7 +310,7 @@ joystick control within the game.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="91" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="91" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="306" height="36"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="92">
@@ -326,7 +327,7 @@ in Boxer’s Audio preferences.</string>
             <rect key="frame" x="0.0" y="0.0" width="272" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="97" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="97" customClass="BXHUDLabel">
                     <rect key="frame" x="-3" y="20" width="278" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Simulated numpad active" id="100">
@@ -346,7 +347,7 @@ in Boxer’s Audio preferences.</string>
             <rect key="frame" x="0.0" y="0.0" width="272" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="107" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="107" customClass="BXHUDLabel">
                     <rect key="frame" x="-14" y="20" width="299" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Simulated numpad disabled" id="108">
@@ -366,7 +367,7 @@ in Boxer’s Audio preferences.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="115" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="115" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Numlock active" id="116">
@@ -386,7 +387,7 @@ in Boxer’s Audio preferences.</string>
             <rect key="frame" x="0.0" y="0.0" width="220" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="119" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="119" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="186" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Numlock disabled" id="122">
@@ -447,7 +448,7 @@ in Boxer’s Audio preferences.</string>
             <rect key="frame" x="0.0" y="0.0" width="434" height="65"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="146" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="146" customClass="BXHUDLabel">
                     <rect key="frame" x="49" y="20" width="368" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Cmd+click to release the mouse pointer." id="147">
@@ -468,8 +469,8 @@ in Boxer’s Audio preferences.</string>
         <image name="BunnyTemplate" width="13" height="14"/>
         <image name="EjectTemplate" width="15" height="13"/>
         <image name="FastForwardBezelTemplate" width="102" height="70"/>
-        <image name="NSLockLockedTemplate" width="10" height="14"/>
-        <image name="NSRightFacingTriangleTemplate" width="9" height="12"/>
+        <image name="NSLockLockedTemplate" width="19" height="19"/>
+        <image name="NSRightFacingTriangleTemplate" width="12" height="17"/>
         <image name="NumlockActiveTemplate" width="96" height="96"/>
         <image name="NumlockInactiveTemplate" width="96" height="96"/>
         <image name="NumpadActiveTemplate" width="112" height="112"/>
diff --git a/Resources/cs.lproj/Bezel.xib b/Resources/cs.lproj/Bezel.xib
index 09589a88c..2addf257c 100644
--- a/Resources/cs.lproj/Bezel.xib
+++ b/Resources/cs.lproj/Bezel.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -36,7 +36,7 @@
             <rect key="frame" x="0.0" y="0.0" width="560" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="5" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="23" width="523" height="44"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="6">
@@ -54,7 +54,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="300" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="8" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="8" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="12" width="260" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[rychlost 386 (3000 cyklů)]" id="9">
@@ -86,7 +86,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="240" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="BXHUDLabel">
                     <rect key="frame" x="20" y="15" width="200" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[100 % plynu]" id="27">
@@ -108,7 +108,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="268" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="30" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="30" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="234" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Disk D přidán]" id="31">
@@ -117,7 +117,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="67" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="67" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="234" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="68">
@@ -137,7 +137,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="268" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="38" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="38" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="234" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Disk D vysunut]" id="43">
@@ -151,7 +151,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="EjectTemplate" id="42" customClass="BXHUDImageCell"/>
                 </imageView>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="69" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="69" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="234" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="70">
@@ -166,7 +166,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="268" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="46" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="46" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="234" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Disk D naimportován]" id="47">
@@ -180,7 +180,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="48" customClass="BXHUDImageCell"/>
                 </imageView>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="71" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="71" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="234" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="72">
@@ -196,7 +196,7 @@ Kombinací Cmd+kliknutí získáte přístup k řádku nabídek.</string>
             <rect key="frame" x="0.0" y="0.0" width="340" height="128"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="52" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="52" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="64" width="306" height="44"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="53">
@@ -207,7 +207,7 @@ ovládání joystickem.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="55" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="55" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="306" height="36"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="56">
@@ -248,7 +248,7 @@ joystickem zapnout přímo ve hře.</string>
             <rect key="frame" x="0.0" y="0.0" width="268" height="200"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="75" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="75" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="45" width="234" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="[Disk D vyměněn]" id="78">
@@ -257,7 +257,7 @@ joystickem zapnout přímo ve hře.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="74" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="74" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="24" width="234" height="18"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" title="[Need For Speed.iso]" id="79">
@@ -287,7 +287,7 @@ joystickem zapnout přímo ve hře.</string>
             <rect key="frame" x="0.0" y="0.0" width="423" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="86" customClass="BXMT32LCDDisplay">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="86" customClass="MT32LCDDisplay" customModule="Boxer" customModuleProvider="target">
                     <rect key="frame" x="20" y="20" width="380" height="47"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="VLOŽTE BUCKAZOID" id="87">
@@ -297,12 +297,13 @@ joystickem zapnout přímo ve hře.</string>
                     </textFieldCell>
                 </textField>
             </subviews>
+            <point key="canvasLocation" x="14" y="135"/>
         </customView>
         <customView id="89" userLabel="MT-32 Missing Bezel" customClass="BXBezelView">
             <rect key="frame" x="0.0" y="0.0" width="340" height="128"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="90" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="90" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="42" width="306" height="66"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Ke správnému přehrávání hudby v této hře jsou zapotřebí ROM MT-32." id="93">
@@ -311,7 +312,7 @@ joystickem zapnout přímo ve hře.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="91" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="91" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="306" height="36"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="92">
@@ -328,7 +329,7 @@ v nastavení zvuku Boxeru.</string>
             <rect key="frame" x="0.0" y="0.0" width="420" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="97" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="97" customClass="BXHUDLabel">
                     <rect key="frame" x="-3" y="20" width="426" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Simulovaná numerická klávesnice je aktivní" id="100">
@@ -349,7 +350,7 @@ v nastavení zvuku Boxeru.</string>
             <rect key="frame" x="0.0" y="0.0" width="420" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="107" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="107" customClass="BXHUDLabel">
                     <rect key="frame" x="-14" y="20" width="447" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Simulovaná numerická klávesnice je neaktivní" id="108">
@@ -369,7 +370,7 @@ v nastavení zvuku Boxeru.</string>
             <rect key="frame" x="0.0" y="0.0" width="420" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="115" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="115" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="386" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Zámek numerické klávesnice je aktivní" id="116">
@@ -390,7 +391,7 @@ v nastavení zvuku Boxeru.</string>
             <rect key="frame" x="0.0" y="0.0" width="420" height="172"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="119" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="119" customClass="BXHUDLabel">
                     <rect key="frame" x="17" y="20" width="386" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Zámek numerické klávesnice je neaktivní" id="122">
@@ -451,7 +452,7 @@ v nastavení zvuku Boxeru.</string>
             <rect key="frame" x="0.0" y="0.0" width="452" height="65"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="146" customClass="BXHUDLabel">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="146" customClass="BXHUDLabel">
                     <rect key="frame" x="49" y="20" width="386" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Kombinací Cmd+kliknutí uvolníte kurzor myši." id="147">
@@ -473,8 +474,8 @@ v nastavení zvuku Boxeru.</string>
         <image name="BunnyTemplate" width="13" height="14"/>
         <image name="EjectTemplate" width="15" height="13"/>
         <image name="FastForwardBezelTemplate" width="102" height="70"/>
-        <image name="NSLockLockedTemplate" width="10" height="14"/>
-        <image name="NSRightFacingTriangleTemplate" width="9" height="12"/>
+        <image name="NSLockLockedTemplate" width="19" height="19"/>
+        <image name="NSRightFacingTriangleTemplate" width="12" height="17"/>
         <image name="NumlockActiveTemplate" width="96" height="96"/>
         <image name="NumlockInactiveTemplate" width="96" height="96"/>
         <image name="NumpadActiveTemplate" width="112" height="112"/>
diff --git a/Standalone/Boxer Standalone-Bridging-Header.h b/Standalone/Boxer Standalone-Bridging-Header.h
index e372b960d..81c8bef1f 100644
--- a/Standalone/Boxer Standalone-Bridging-Header.h	
+++ b/Standalone/Boxer Standalone-Bridging-Header.h	
@@ -6,3 +6,7 @@
 #import "BXFileTypes.h"
 #import "NSError+ADBErrorHelpers.h"
 #import "RegexKitLite.h" //FIXME: we shouldn't introduce dependencies on 3rd-party libraries.
+#import "NSShadow+ADBShadowExtensions.h"
+#import "NSImage+ADBImageEffects.h"
+#import "NSBezierPath+MCAdditions.h"
+#import "ADBGeometry.h"