diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index f47ad92..4854926 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit f47ad929fc234a771b639ba307c57f084235eda2
+Subproject commit 4854926b2a21fe0c6e652dc1ccb4e7abdef3dcb6
diff --git a/Delta/AppDelegate.swift b/Delta/AppDelegate.swift
index 3c453c6..ac4ce6a 100644
--- a/Delta/AppDelegate.swift
+++ b/Delta/AppDelegate.swift
@@ -90,7 +90,7 @@ extension AppDelegate
         return self.openURL(url)
     }
     
-    @discardableResult fileprivate func openURL(_ url: URL) -> Bool
+    @discardableResult private func openURL(_ url: URL) -> Bool
     {
         guard url.isFileURL else { return false }
         
diff --git a/Delta/Components/Collection View/GridCollectionViewCell.swift b/Delta/Components/Collection View/GridCollectionViewCell.swift
index df6638b..f88bc2b 100644
--- a/Delta/Components/Collection View/GridCollectionViewCell.swift	
+++ b/Delta/Components/Collection View/GridCollectionViewCell.swift	
@@ -45,15 +45,15 @@ class GridCollectionViewCell: UICollectionViewCell
         }
     }
     
-    fileprivate var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
+    private var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
     
-    fileprivate var imageViewWidthConstraint: NSLayoutConstraint!
-    fileprivate var imageViewHeightConstraint: NSLayoutConstraint!
+    private var imageViewWidthConstraint: NSLayoutConstraint!
+    private var imageViewHeightConstraint: NSLayoutConstraint!
     
-    fileprivate var textLabelBottomAnchorConstraint: NSLayoutConstraint!
+    private var textLabelBottomAnchorConstraint: NSLayoutConstraint!
     
-    fileprivate var textLabelVerticalSpacingConstraint: NSLayoutConstraint!
-    fileprivate var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint?
+    private var textLabelVerticalSpacingConstraint: NSLayoutConstraint!
+    private var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint?
     
     override init(frame: CGRect)
     {
diff --git a/Delta/Components/Popover Menu/ListMenuViewController.swift b/Delta/Components/Popover Menu/ListMenuViewController.swift
index 88bd43f..6129d47 100644
--- a/Delta/Components/Popover Menu/ListMenuViewController.swift	
+++ b/Delta/Components/Popover Menu/ListMenuViewController.swift	
@@ -17,7 +17,7 @@ class ListMenuViewController: UITableViewController
         set { self.dataSource.items = newValue }
     }
     
-    fileprivate let dataSource = RSTArrayTableViewDataSource<MenuItem>(items: [])
+    private let dataSource = RSTArrayTableViewDataSource<MenuItem>(items: [])
     
     override var preferredContentSize: CGSize {
         get {
diff --git a/Delta/Components/Popover Menu/PopoverMenuButton.swift b/Delta/Components/Popover Menu/PopoverMenuButton.swift
index 6880f3b..e242765 100644
--- a/Delta/Components/Popover Menu/PopoverMenuButton.swift	
+++ b/Delta/Components/Popover Menu/PopoverMenuButton.swift	
@@ -35,7 +35,7 @@ extension UINavigationBar
         return textAttributes
     }
     
-    fileprivate var _defaultTitleTextAttributes: [NSAttributedStringKey: Any]? {
+    private var _defaultTitleTextAttributes: [NSAttributedStringKey: Any]? {
         guard self.titleTextAttributes == nil else { return self.titleTextAttributes }
         
         guard
@@ -59,11 +59,11 @@ class PopoverMenuButton: UIControl
         }
     }
     
-    fileprivate let textLabel: UILabel
-    fileprivate let arrowLabel: UILabel
-    fileprivate let stackView: UIStackView
+    private let textLabel: UILabel
+    private let arrowLabel: UILabel
+    private let stackView: UIStackView
     
-    fileprivate var parentNavigationBar: UINavigationBar? {
+    private var parentNavigationBar: UINavigationBar? {
         guard let navigationController = self.parentViewController as? UINavigationController ?? self.parentViewController?.navigationController else { return nil }
         guard self.isDescendant(of: navigationController.navigationBar) else { return nil }
         
diff --git a/Delta/Database/DatabaseManager.swift b/Delta/Database/DatabaseManager.swift
index 2b36c14..d5aa731 100644
--- a/Delta/Database/DatabaseManager.swift
+++ b/Delta/Database/DatabaseManager.swift
@@ -60,7 +60,7 @@ final class DatabaseManager: NSPersistentContainer
 {
     static let shared = DatabaseManager()
     
-    fileprivate var gamesDatabase: GamesDatabase? = nil
+    private var gamesDatabase: GamesDatabase? = nil
     
     private init()
     {
diff --git a/Delta/Database/InputStreamOutputWriter.swift b/Delta/Database/InputStreamOutputWriter.swift
index 76e4cb3..5ed98d8 100644
--- a/Delta/Database/InputStreamOutputWriter.swift
+++ b/Delta/Database/InputStreamOutputWriter.swift
@@ -15,9 +15,9 @@ class InputStreamOutputWriter: NSObject
     let inputStream: InputStream
     let outputStream: OutputStream
     
-    fileprivate var completion: ((Error?) -> Void)?
+    private var completion: ((Error?) -> Void)?
     
-    fileprivate var dataBuffer = Data(capacity: MaximumBufferLength * 2)
+    private var dataBuffer = Data(capacity: MaximumBufferLength * 2)
     
     init(inputStream: InputStream, outputStream: OutputStream)
     {
diff --git a/Delta/Database/Model/Human/ControllerSkin.swift b/Delta/Database/Model/Human/ControllerSkin.swift
index 7b73368..bfbc6fe 100644
--- a/Delta/Database/Model/Human/ControllerSkin.swift
+++ b/Delta/Database/Model/Human/ControllerSkin.swift
@@ -61,7 +61,7 @@ public class ControllerSkin: _ControllerSkin
         return self.controllerSkin?.isDebugModeEnabled ?? false
     }
     
-    fileprivate lazy var controllerSkin: DeltaCore.ControllerSkin? = {
+    private lazy var controllerSkin: DeltaCore.ControllerSkin? = {
         let controllerSkin = self.isStandard ? DeltaCore.ControllerSkin.standardControllerSkin(for: self.gameType) : DeltaCore.ControllerSkin(fileURL: self.fileURL)
         return controllerSkin
     }()
diff --git a/Delta/Database/Model/Human/GameControllerInputMapping.swift b/Delta/Database/Model/Human/GameControllerInputMapping.swift
index 3a44b4e..0a71b27 100644
--- a/Delta/Database/Model/Human/GameControllerInputMapping.swift
+++ b/Delta/Database/Model/Human/GameControllerInputMapping.swift
@@ -13,7 +13,7 @@ import DeltaCore
 @objc(GameControllerInputMapping)
 public class GameControllerInputMapping: _GameControllerInputMapping
 {
-    fileprivate var inputMapping: DeltaCore.GameControllerInputMapping {
+    private var inputMapping: DeltaCore.GameControllerInputMapping {
         get { return self.deltaCoreInputMapping as! DeltaCore.GameControllerInputMapping }
         set { self.deltaCoreInputMapping = newValue }
     }
diff --git a/Delta/Database/OpenVGDB/GamesDatabase.swift b/Delta/Database/OpenVGDB/GamesDatabase.swift
index 43952e0..ef87290 100644
--- a/Delta/Database/OpenVGDB/GamesDatabase.swift
+++ b/Delta/Database/OpenVGDB/GamesDatabase.swift
@@ -68,7 +68,7 @@ class GamesDatabase
 {
     static let version = -1
     
-    fileprivate let connection: Connection
+    private let connection: Connection
     
     init() throws
     {
diff --git a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
index c201e10..f4a0fe6 100644
--- a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
+++ b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
@@ -15,9 +15,9 @@ class GamesDatabaseBrowserViewController: UITableViewController
 {
     var selectionHandler: ((GameMetadata) -> Void)?
     
-    fileprivate let database: GamesDatabase?
+    private let database: GamesDatabase?
     
-    fileprivate let dataSource: RSTArrayTableViewPrefetchingDataSource<GameMetadata, UIImage>
+    private let dataSource: RSTArrayTableViewPrefetchingDataSource<GameMetadata, UIImage>
     
     override init(style: UITableViewStyle) {
         fatalError()
diff --git a/Delta/Emulation/GameViewController.swift b/Delta/Emulation/GameViewController.swift
index 1af9092..d8f1133 100644
--- a/Delta/Emulation/GameViewController.swift
+++ b/Delta/Emulation/GameViewController.swift
@@ -72,11 +72,11 @@ class GameViewController: DeltaCore.GameViewController
     }
     
     //MARK: - Private Properties -
-    fileprivate var pauseViewController: PauseViewController?
-    fileprivate var pausingGameController: GameController?
+    private var pauseViewController: PauseViewController?
+    private var pausingGameController: GameController?
     
     // Prevents the same save state from being saved multiple times
-    fileprivate var pausedSaveState: PausedSaveState? {
+    private var pausedSaveState: PausedSaveState? {
         didSet
         {
             if let saveState = oldValue, self.pausedSaveState == nil
@@ -93,17 +93,17 @@ class GameViewController: DeltaCore.GameViewController
         }
     }
     
-    fileprivate var _isLoadingSaveState = false
+    private var _isLoadingSaveState = false
     
-    fileprivate var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()])
+    private var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()])
     
     // Sustain Buttons
-    fileprivate var isSelectingSustainedButtons = false
-    fileprivate var sustainInputsMapping: SustainInputsMapping?
+    private var isSelectingSustainedButtons = false
+    private var sustainInputsMapping: SustainInputsMapping?
     
-    fileprivate var sustainButtonsContentView: UIView!
-    fileprivate var sustainButtonsBlurView: UIVisualEffectView!
-    fileprivate var sustainButtonsBackgroundView: RSTPlaceholderView!
+    private var sustainButtonsContentView: UIView!
+    private var sustainButtonsBlurView: UIVisualEffectView!
+    private var sustainButtonsBackgroundView: RSTPlaceholderView!
     
     required init()
     {
@@ -460,7 +460,7 @@ private extension GameViewController
 /// Save States
 extension GameViewController: SaveStatesViewControllerDelegate
 {
-    fileprivate func updateAutoSaveState()
+    private func updateAutoSaveState()
     {
         // Ensures game is non-nil and also a Game subclass
         guard let game = self.game as? Game else { return }
@@ -513,7 +513,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
         }
     }
     
-    fileprivate func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil)
+    private func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil)
     {
         let isRunning = (self.emulatorCore?.state == .running)
         
@@ -567,7 +567,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
         }
     }
     
-    fileprivate func load(_ saveState: SaveStateProtocol)
+    private func load(_ saveState: SaveStateProtocol)
     {
         let isRunning = (self.emulatorCore?.state == .running)
         
diff --git a/Delta/Emulation/PreviewGameViewController.swift b/Delta/Emulation/PreviewGameViewController.swift
index 52480fd..42833a4 100644
--- a/Delta/Emulation/PreviewGameViewController.swift
+++ b/Delta/Emulation/PreviewGameViewController.swift
@@ -27,7 +27,7 @@ class PreviewGameViewController: DeltaCore.GameViewController
         }
     }
     
-    fileprivate var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated)
+    private var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated)
     
     override var game: GameProtocol? {
         willSet {
diff --git a/Delta/Game Selection/GameCollectionViewController.swift b/Delta/Game Selection/GameCollectionViewController.swift
index ac90b02..b947f39 100644
--- a/Delta/Game Selection/GameCollectionViewController.swift	
+++ b/Delta/Game Selection/GameCollectionViewController.swift	
@@ -43,16 +43,16 @@ class GameCollectionViewController: UICollectionViewController
     
     weak var activeEmulatorCore: EmulatorCore?
     
-    fileprivate var activeSaveState: SaveStateProtocol?
+    private var activeSaveState: SaveStateProtocol?
     
-    fileprivate let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<Game, UIImage>
-    fileprivate let prototypeCell = GridCollectionViewCell()
+    private let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<Game, UIImage>
+    private let prototypeCell = GridCollectionViewCell()
     
-    fileprivate var _performing3DTouchTransition = false
-    fileprivate weak var _destination3DTouchTransitionViewController: UIViewController?
+    private var _performing3DTouchTransition = false
+    private weak var _destination3DTouchTransitionViewController: UIViewController?
     
-    fileprivate var _renameAction: UIAlertAction?
-    fileprivate var _changingArtworkGame: Game?
+    private var _renameAction: UIAlertAction?
+    private var _changingArtworkGame: Game?
     
     required init?(coder aDecoder: NSCoder)
     {
diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift
index 7067982..260a271 100644
--- a/Delta/Game Selection/GamesViewController.swift	
+++ b/Delta/Game Selection/GamesViewController.swift	
@@ -35,11 +35,11 @@ class GamesViewController: UIViewController
         }
     }
     
-    fileprivate var pageViewController: UIPageViewController!
-    fileprivate var placeholderView: RSTPlaceholderView!
-    fileprivate var pageControl: UIPageControl!
+    private var pageViewController: UIPageViewController!
+    private var placeholderView: RSTPlaceholderView!
+    private var pageControl: UIPageControl!
     
-    fileprivate let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>
+    private let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
         fatalError("initWithNibName: not implemented")
@@ -273,7 +273,7 @@ private extension GamesViewController
 /// Importing
 extension GamesViewController: ImportControllerDelegate
 {
-    @IBAction fileprivate func importFiles()
+    @IBAction private func importFiles()
     {
         var documentTypes = Set(System.supportedSystems.map { $0.gameType.rawValue })
         documentTypes.insert(kUTTypeZipArchive as String)
diff --git a/Delta/Game Selection/Segues/GamesStoryboardSegue.swift b/Delta/Game Selection/Segues/GamesStoryboardSegue.swift
index 6ccd008..c4c74a1 100644
--- a/Delta/Game Selection/Segues/GamesStoryboardSegue.swift	
+++ b/Delta/Game Selection/Segues/GamesStoryboardSegue.swift	
@@ -10,9 +10,9 @@ import UIKit
 
 class GamesStoryboardSegue: UIStoryboardSegue
 {
-    fileprivate let animator: UIViewPropertyAnimator
+    private let animator: UIViewPropertyAnimator
     
-    fileprivate var isPresenting: Bool = true
+    private var isPresenting: Bool = true
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {
diff --git a/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift b/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift
index 5183340..b0da5e4 100644
--- a/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift	
+++ b/Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift	
@@ -10,9 +10,9 @@ import UIKit
 
 class InitialGamesStoryboardSegue: UIStoryboardSegue
 {
-    fileprivate let animator: UIViewPropertyAnimator
+    private let animator: UIViewPropertyAnimator
     
-    fileprivate var isPresenting: Bool = true
+    private var isPresenting: Bool = true
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {
diff --git a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift
index 51b008e..4d5d558 100644
--- a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift	
+++ b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift	
@@ -15,7 +15,7 @@ class PhotoLibraryImportOption: NSObject, ImportOption
     let image: UIImage? = nil
     
     private let presentingViewController: UIViewController
-    fileprivate var completionHandler: ((Set<URL>?) -> Void)?
+    private var completionHandler: ((Set<URL>?) -> Void)?
     
     init(presentingViewController: UIViewController)
     {
diff --git a/Delta/Importing/ImportController.swift b/Delta/Importing/ImportController.swift
index b0fd6ea..a394054 100644
--- a/Delta/Importing/ImportController.swift
+++ b/Delta/Importing/ImportController.swift
@@ -37,14 +37,14 @@ class ImportController: NSObject
     var delegate: ImportControllerDelegate?
     var importOptions: [ImportOption]?
     
-    fileprivate weak var presentingViewController: UIViewController?
+    private weak var presentingViewController: UIViewController?
     
     // Store presentedViewController separately, since when we dismiss we don't know if it has already been dismissed.
     // Calling dismiss on presentingViewController in that case would dismiss presentingViewController, which is bad.
-    fileprivate weak var presentedViewController: UIViewController?
+    private weak var presentedViewController: UIViewController?
     
-    fileprivate let importQueue: OperationQueue
-    fileprivate let fileCoordinator: NSFileCoordinator
+    private let importQueue: OperationQueue
+    private let fileCoordinator: NSFileCoordinator
     
     init(documentTypes: Set<String>)
     {
@@ -104,12 +104,12 @@ class ImportController: NSObject
         #endif
     }
     
-    @objc fileprivate func cancel()
+    @objc private func cancel()
     {
         self.finish(with: nil, errors: [])
     }
     
-    fileprivate func finish(with urls: Set<URL>?, errors: [Error])
+    private func finish(with urls: Set<URL>?, errors: [Error])
     {
         if let urls = urls
         {
diff --git a/Delta/Launch/LaunchViewController.swift b/Delta/Launch/LaunchViewController.swift
index 9f5d7ba..c2d0be5 100644
--- a/Delta/Launch/LaunchViewController.swift
+++ b/Delta/Launch/LaunchViewController.swift
@@ -10,10 +10,10 @@ import UIKit
 
 class LaunchViewController: UIViewController
 {
-    @IBOutlet fileprivate var gameViewContainerView: UIView!
-    fileprivate var gameViewController: GameViewController!
+    @IBOutlet private var gameViewContainerView: UIView!
+    private var gameViewController: GameViewController!
     
-    fileprivate var presentedGameViewController: Bool = false
+    private var presentedGameViewController: Bool = false
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return self.gameViewController?.preferredStatusBarStyle ?? .lightContent
diff --git a/Delta/Pause Menu/Cheats/CheatTextView.swift b/Delta/Pause Menu/Cheats/CheatTextView.swift
index 0cf9966..cafcb6c 100644
--- a/Delta/Pause Menu/Cheats/CheatTextView.swift	
+++ b/Delta/Pause Menu/Cheats/CheatTextView.swift	
@@ -26,7 +26,7 @@ class CheatTextView: UITextView
         }
     }
     
-    @NSCopying fileprivate var attributedFormat: NSAttributedString?
+    @NSCopying private var attributedFormat: NSAttributedString?
     
     required init?(coder aDecoder: NSCoder)
     {
diff --git a/Delta/Pause Menu/Cheats/CheatsViewController.swift b/Delta/Pause Menu/Cheats/CheatsViewController.swift
index c42fea4..db9cf70 100644
--- a/Delta/Pause Menu/Cheats/CheatsViewController.swift	
+++ b/Delta/Pause Menu/Cheats/CheatsViewController.swift	
@@ -29,7 +29,7 @@ class CheatsViewController: UITableViewController
     
     weak var delegate: CheatsViewControllerDelegate?
     
-    fileprivate let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController())
+    private let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController())
 }
 
 extension CheatsViewController
diff --git a/Delta/Pause Menu/Cheats/EditCheatViewController.swift b/Delta/Pause Menu/Cheats/EditCheatViewController.swift
index 616555b..e36d29e 100644
--- a/Delta/Pause Menu/Cheats/EditCheatViewController.swift	
+++ b/Delta/Pause Menu/Cheats/EditCheatViewController.swift	
@@ -43,19 +43,19 @@ class EditCheatViewController: UITableViewController
     
     var isPreviewing = false
     
-    fileprivate var supportedCheatFormats: [CheatFormat]!
+    private var supportedCheatFormats: [CheatFormat]!
     
-    fileprivate var selectedCheatFormat: CheatFormat {
+    private var selectedCheatFormat: CheatFormat {
         let cheatFormat = self.supportedCheatFormats[self.typeSegmentedControl.selectedSegmentIndex]
         return cheatFormat
     }
     
-    fileprivate var mutableCheat: Cheat!
-    fileprivate var managedObjectContext = DatabaseManager.shared.newBackgroundContext()
+    private var mutableCheat: Cheat!
+    private var managedObjectContext = DatabaseManager.shared.newBackgroundContext()
     
-    @IBOutlet fileprivate var nameTextField: UITextField!
-    @IBOutlet fileprivate var typeSegmentedControl: UISegmentedControl!
-    @IBOutlet fileprivate var codeTextView: CheatTextView!
+    @IBOutlet private var nameTextField: UITextField!
+    @IBOutlet private var typeSegmentedControl: UISegmentedControl!
+    @IBOutlet private var codeTextView: CheatTextView!
     
     override var previewActionItems: [UIPreviewActionItem]
     {
diff --git a/Delta/Pause Menu/GridMenuViewController.swift b/Delta/Pause Menu/GridMenuViewController.swift
index 8552552..a92fad3 100644
--- a/Delta/Pause Menu/GridMenuViewController.swift	
+++ b/Delta/Pause Menu/GridMenuViewController.swift	
@@ -23,12 +23,12 @@ class GridMenuViewController: UICollectionViewController
         get { return self.collectionView?.contentSize ?? CGSize.zero }
     }
     
-    fileprivate let dataSource = RSTArrayCollectionViewDataSource<MenuItem>(items: [])
+    private let dataSource = RSTArrayCollectionViewDataSource<MenuItem>(items: [])
     
-    fileprivate var prototypeCell = GridCollectionViewCell()
-    fileprivate var previousIndexPath: IndexPath? = nil
+    private var prototypeCell = GridCollectionViewCell()
+    private var previousIndexPath: IndexPath? = nil
     
-    fileprivate var registeredKVOObservers = Set<NSKeyValueObservation>()
+    private var registeredKVOObservers = Set<NSKeyValueObservation>()
     
     init()
     {
diff --git a/Delta/Pause Menu/PauseViewController.swift b/Delta/Pause Menu/PauseViewController.swift
index 9287e85..68f6e09 100644
--- a/Delta/Pause Menu/PauseViewController.swift	
+++ b/Delta/Pause Menu/PauseViewController.swift	
@@ -38,9 +38,9 @@ class PauseViewController: UIViewController, PauseInfoProviding
     /// Save States
     weak var saveStatesViewControllerDelegate: SaveStatesViewControllerDelegate?
     
-    fileprivate var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading
+    private var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading
     
-    fileprivate var pauseNavigationController: UINavigationController!
+    private var pauseNavigationController: UINavigationController!
     
     /// UIViewController
     override var preferredContentSize: CGSize {
diff --git a/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift b/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift
index 554c945..b4f8ec7 100644
--- a/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift	
+++ b/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift	
@@ -12,7 +12,7 @@ class SaveStatesCollectionHeaderView: UICollectionReusableView
 {
     let textLabel = UILabel()
     
-    fileprivate let vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
+    private let vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
     
     var isTextLabelVibrancyEnabled = true {
         didSet {
diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift
index 588c3b9..019be65 100644
--- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
+++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
@@ -59,18 +59,18 @@ class SaveStatesViewController: UICollectionViewController
         }
     }
         
-    fileprivate var vibrancyView: UIVisualEffectView!
-    fileprivate var placeholderView: RSTPlaceholderView!
+    private var vibrancyView: UIVisualEffectView!
+    private var placeholderView: RSTPlaceholderView!
     
-    fileprivate var prototypeCell = GridCollectionViewCell()
-    fileprivate var prototypeCellWidthConstraint: NSLayoutConstraint!
-    fileprivate var prototypeHeader = SaveStatesCollectionHeaderView()
+    private var prototypeCell = GridCollectionViewCell()
+    private var prototypeCellWidthConstraint: NSLayoutConstraint!
+    private var prototypeHeader = SaveStatesCollectionHeaderView()
     
-    fileprivate let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<SaveState, UIImage>
+    private let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<SaveState, UIImage>
     
-    fileprivate var emulatorCoreSaveState: SaveStateProtocol?
+    private var emulatorCoreSaveState: SaveStateProtocol?
     
-    fileprivate let dateFormatter: DateFormatter
+    private let dateFormatter: DateFormatter
     
     required init?(coder aDecoder: NSCoder)
     {
@@ -562,7 +562,7 @@ private extension SaveStatesViewController
 //MARK: - 3D Touch -
 extension SaveStatesViewController: UIViewControllerPreviewingDelegate
 {
-    fileprivate func prepareEmulatorCoreSaveState()
+    private func prepareEmulatorCoreSaveState()
     {
         guard let emulatorCore = self.emulatorCore else { return }
         
diff --git a/Delta/Pause Menu/Segues/PauseStoryboardSegue.swift b/Delta/Pause Menu/Segues/PauseStoryboardSegue.swift
index 238657d..31e537e 100644
--- a/Delta/Pause Menu/Segues/PauseStoryboardSegue.swift	
+++ b/Delta/Pause Menu/Segues/PauseStoryboardSegue.swift	
@@ -10,8 +10,8 @@ import UIKit
 
 class PauseStoryboardSegue: UIStoryboardSegue
 {
-    fileprivate let animator: UIViewPropertyAnimator
-    fileprivate let presentationController: PausePresentationController
+    private let animator: UIViewPropertyAnimator
+    private let presentationController: PausePresentationController
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {
diff --git a/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift b/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift
index f5835a2..49b5575 100644
--- a/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift	
+++ b/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift	
@@ -26,7 +26,7 @@ class ControllerSkinsViewController: UITableViewController
         }
     }
     
-    fileprivate let dataSource: RSTFetchedResultsTableViewPrefetchingDataSource<ControllerSkin, UIImage>
+    private let dataSource: RSTFetchedResultsTableViewPrefetchingDataSource<ControllerSkin, UIImage>
     
     required init?(coder aDecoder: NSCoder)
     {
diff --git a/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift b/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift
index 87e3870..c0b0545 100644
--- a/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift	
+++ b/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift	
@@ -12,7 +12,7 @@ import DeltaCore
 
 extension SystemControllerSkinsViewController
 {
-    fileprivate enum Section: Int
+    private enum Section: Int
     {
         case portrait
         case landscape
@@ -23,8 +23,8 @@ class SystemControllerSkinsViewController: UITableViewController
 {
     var system: System!
     
-    @IBOutlet fileprivate var portraitImageView: UIImageView!
-    @IBOutlet fileprivate var landscapeImageView: UIImageView!
+    @IBOutlet private var portraitImageView: UIImageView!
+    @IBOutlet private var landscapeImageView: UIImageView!
 }
 
 extension SystemControllerSkinsViewController
diff --git a/Delta/Settings/Controllers/ControllerInputsViewController.swift b/Delta/Settings/Controllers/ControllerInputsViewController.swift
index a992465..228b81f 100644
--- a/Delta/Settings/Controllers/ControllerInputsViewController.swift
+++ b/Delta/Settings/Controllers/ControllerInputsViewController.swift
@@ -28,17 +28,17 @@ class ControllerInputsViewController: UIViewController
         }
     }
     
-    fileprivate lazy var managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.newBackgroundContext()
-    fileprivate var inputMappings = [System: GameControllerInputMapping]()
+    private lazy var managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.newBackgroundContext()
+    private var inputMappings = [System: GameControllerInputMapping]()
     
-    fileprivate let supportedActionInputs: [ActionInput] = [.quickSave, .quickLoad, .fastForward]
+    private let supportedActionInputs: [ActionInput] = [.quickSave, .quickLoad, .fastForward]
     
-    fileprivate var gameViewController: DeltaCore.GameViewController!
-    fileprivate var actionsMenuViewController: GridMenuViewController!
+    private var gameViewController: DeltaCore.GameViewController!
+    private var actionsMenuViewController: GridMenuViewController!
     
-    fileprivate var calloutViews = [AnyInput: InputCalloutView]()
+    private var calloutViews = [AnyInput: InputCalloutView]()
     
-    fileprivate var activeCalloutView: InputCalloutView?
+    private var activeCalloutView: InputCalloutView?
     
     @IBOutlet private var actionsMenuViewControllerHeightConstraint: NSLayoutConstraint!
     @IBOutlet private var cancelTapGestureRecognizer: UITapGestureRecognizer!
diff --git a/Delta/Settings/Controllers/ControllersSettingsViewController.swift b/Delta/Settings/Controllers/ControllersSettingsViewController.swift
index 103101d..9d20b3d 100644
--- a/Delta/Settings/Controllers/ControllersSettingsViewController.swift
+++ b/Delta/Settings/Controllers/ControllersSettingsViewController.swift
@@ -13,7 +13,7 @@ import Roxas
 
 extension ControllersSettingsViewController
 {
-    fileprivate enum Section: Int
+    private enum Section: Int
     {
         case none
         case localDevice
@@ -46,7 +46,7 @@ class ControllersSettingsViewController: UITableViewController
         }
     }
     
-    fileprivate var gameController: GameController? {
+    private var gameController: GameController? {
         didSet {
             // Order matters since localDeviceController changes Settings.localControllerPlayerIndex, which sends out NSNotification.
             if oldValue == self.localDeviceController
@@ -62,9 +62,9 @@ class ControllersSettingsViewController: UITableViewController
         }
     }
     
-    fileprivate var connectedControllers = ExternalGameControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax })
+    private var connectedControllers = ExternalGameControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax })
     
-    fileprivate lazy var localDeviceController: LocalDeviceController = {
+    private lazy var localDeviceController: LocalDeviceController = {
         let device = LocalDeviceController()
         device.playerIndex = Settings.localControllerPlayerIndex
         
diff --git a/Delta/Settings/Controllers/InputCalloutView.swift b/Delta/Settings/Controllers/InputCalloutView.swift
index b6c0d7a..f764f4b 100644
--- a/Delta/Settings/Controllers/InputCalloutView.swift
+++ b/Delta/Settings/Controllers/InputCalloutView.swift
@@ -33,7 +33,7 @@ class InputCalloutView: SMCalloutView
         }
     }
     
-    fileprivate let textLabel: UILabel
+    private let textLabel: UILabel
     
     init()
     {
diff --git a/Delta/Settings/SettingsViewController.swift b/Delta/Settings/SettingsViewController.swift
index fc394a1..38efe76 100644
--- a/Delta/Settings/SettingsViewController.swift
+++ b/Delta/Settings/SettingsViewController.swift
@@ -12,7 +12,7 @@ import DeltaCore
 
 import Roxas
 
-fileprivate extension SettingsViewController
+private extension SettingsViewController
 {
     enum Section: Int
     {
@@ -37,12 +37,12 @@ fileprivate extension SettingsViewController
 
 class SettingsViewController: UITableViewController
 {
-    @IBOutlet fileprivate var controllerOpacityLabel: UILabel!
-    @IBOutlet fileprivate var controllerOpacitySlider: UISlider!
+    @IBOutlet private var controllerOpacityLabel: UILabel!
+    @IBOutlet private var controllerOpacitySlider: UISlider!
     
-    fileprivate var selectionFeedbackGenerator: UISelectionFeedbackGenerator?
+    private var selectionFeedbackGenerator: UISelectionFeedbackGenerator?
     
-    fileprivate var previousSelectedRowIndexPath: IndexPath?
+    private var previousSelectedRowIndexPath: IndexPath?
     
     required init?(coder aDecoder: NSCoder)
     {