diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a075af..6882459 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,15 +6,17 @@ on:
     branches: [main]
 
 jobs:
-  macos_big_sur:
-    runs-on: macos-11
+  macos_sonoma:
+    # check https://github.com/actions/runner-images for available versions
+    runs-on: macos-14
 
     strategy:
       matrix:
         xcode:
-          - "13.2" # Swift 5.5
+          # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+          - "15.4"
 
-    name: "macOS Big Sur (Xcode ${{ matrix.xcode }})"
+    name: "macOS 14 Sonoma ARM (Xcode ${{ matrix.xcode }})"
 
     steps:
       - name: Checkout
@@ -33,7 +35,41 @@ jobs:
         run: |
           make txz
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: allapps.tar.xz
+          name: macpin-allapps-arm64.tar.xz
           path: ${{ steps.getpaths.outputs.TXZ_PATH }}
+
+##macos_sonoma_x86:
+##  # check https://github.com/actions/runner-images for available versions
+##  runs-on: macos-14-large
+
+##  strategy:
+##    matrix:
+##      xcode:
+##        # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+##        - "15.4"
+
+##  name: "macOS 14 Sonoma x86 (Xcode ${{ matrix.xcode }})"
+
+##  steps:
+##    - name: Checkout
+##      uses: actions/checkout@v1
+##    - name: Get build paths
+##      id: getpaths
+##      run: |
+##        echo ::set-output name=OUT_PATH::$(make where-out 2>/dev/null | tail -n1)
+##        echo ::set-output name=TXZ_PATH::$(make where-txz 2>/dev/null | tail -n1)
+##    - name: Build All Apps
+##      run: |
+##        make allapps
+##      env:
+##        DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+##    - name: Create Package
+##      run: |
+##        make txz
+##    - name: Upload artifact
+##      uses: actions/upload-artifact@v4
+##      with:
+##        name: macpin-allapps-x86.tar.xz
+##        path: ${{ steps.getpaths.outputs.TXZ_PATH }}
diff --git a/Makefile b/Makefile
index aec08b2..5fee099 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export
 #^ export all the variables
 builddir			?= build
 
-VERSION				:= 2022.0.0
+VERSION				:= 2026.0.0
 
 macpin				:= MacPin
 macpin_sites		?= sites
@@ -219,6 +219,7 @@ $(outdir)/Frameworks/%.framework: $(jumbody) $(jumbody).dSYM $(outdir)/Framework
 	@cp -RL $(jumbody) $@/Versions/A/$*
 	@cp -RL $(jumbody).dSYM $@/Versions/A/$*.dSYM
 	# need a Resources/Info-macos.plist & version.plist
+	touch $@/Versions/A/Resources/stamp.file
 	-[ ! -n "$(codesign)" ] || codesign --verbose=4 --sign '$(appsig)' --timestamp --options runtime --force --deep --ignore-resources --strict --entitlements $(outdir)/$*.entitlements.plist $@
 
 #build the app bundle
@@ -229,7 +230,7 @@ $(appdir)/%.app: $(macpin_sites)/% $(macpin_sites)/%/* $(appdir)/%.app/Contents/
 	COMMAND_MODE=legacy cp -fRL templates/Resources $@/Contents
 	#git ls-files -zc $(bundle_untracked) $(macpin_sites)/$* | xargs -0 -J % install -DT % $@/Contents/Resources/
 	(($(bundle_untracked))) || git archive HEAD $(macpin_sites)/$*/ | tar -xv --strip-components 2 -C $@/Contents/Resources
-	(($(bundle_untracked))) && COMMAND_MODE=legacy cp -fRL $(macpin_sites)/$*/* $@/Contents/Resources/ || true
+	(($(bundle_untracked))) && COMMAND_MODE=legacy cp -lfRL $(macpin_sites)/$*/* $@/Contents/Resources/ || true
 	[ ! -d $@/Contents/Resources/Library ] || ln -sfh Resources/Library $@/Contents/Library
 	plutil -replace NSHumanReadableCopyright -string "built $(shell date) by $(shell id -F)" $@/Contents/Info.plist >/dev/null
 	[ ! -f "$(macpin_sites)/$*/Makefile" ] || $(MAKE) -C $@/Contents/Resources
@@ -237,7 +238,7 @@ $(appdir)/%.app: $(macpin_sites)/% $(macpin_sites)/%/* $(appdir)/%.app/Contents/
 	[ ! -n "$(codesign)" ] || codesign --verbose=4 --sign '$(appsig)' --timestamp --force --ignore-resources --entitlements $(outdir)/$*.entitlements.plist $@
 	-codesign --display -r- --verbose=4 --deep --entitlements :- $@
 	-spctl -vvvv --assess --type execute $@ # App Store-ability
-	[ ! -n "$(codesign)" ] || codesign --verbose=4 --deep --verify --strict $@
+	[ ! -n "$(codesign)" ] || codesign --verbose=4 --verify --strict $@
 	-[ ! -z "$(codesign)" ] || codesign --verbose=4 --remove-signature $@
 	@touch $@
 #xattr -w com.apple.application-instance $(shell echo uuidgen) $@
diff --git a/Package.swift b/Package.swift
index cebaa78..9856e8e 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,11 +1,9 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.7
 import PackageDescription
 import Foundation
 let package = Package(
     name: "MacPin",
-    //platforms: [.macOS(.v10_15)],
-    // whines about a lot of unguarded calls to 10.15.4 apis
-    platforms: [.macOS(.v11)],
+    platforms: [.macOS(.v13)],
     products: [
         .library(name: "MacPin", type: .dynamic, targets: ["MacPin"]),
         .executable(name: "MacPin_static", targets: ["MacPin_static"]),
@@ -60,7 +58,10 @@ if let iosvar = ProcessInfo.processInfo.environment["MACPIN_IOS"], !iosvar.isEmp
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
             ],
-            path: "Tools/iconify"
+            path: "Tools/iconify",
+            swiftSettings: [
+                //.swiftLanguageMode(.v5)
+            ]
         ),
         .target(name: "MacPin",
             dependencies: [
@@ -71,17 +72,29 @@ if let iosvar = ProcessInfo.processInfo.environment["MACPIN_IOS"], !iosvar.isEmp
                 "Linenoise",
                 "UTIKit",
             ],
-            path: "Sources/MacPinOSX"
+            path: "Sources/MacPinOSX",
+            swiftSettings: [
+                //.swiftLanguageMode(.v5),
+                //.interoperabilityMode(.Cxx)
+            ]
         ),
         .executableTarget(
             name: "MacPin_static",
             dependencies: [
                 .target(name: "MacPin")
+            ],
+            swiftSettings: [
+                //.swiftLanguageMode(.v5),
+                //.interoperabilityMode(.Cxx)
             ]
         ),
         .executableTarget(
             name: "MacPin_stub",
             dependencies: [],
+            swiftSettings: [
+                //.swiftLanguageMode(.v5),
+                //.interoperabilityMode(.Cxx)
+            ],
             linkerSettings: [
                 .unsafeFlags(["-Xlinker", "-rpath", "-Xlinker", "@loader_path:@loader_path/../Frameworks"])
             ]
diff --git a/README.md b/README.md
index 03ff2c3..9e956c0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ $ du -hs build/macosx-x86_64-apple-macosx10.13/apps/{Slack,MacPin}.app/
 ```
 
 ## Project Status
-Uses swift 5.4 & WKWebView.
+Uses swift 5.7 & WKWebView.
 `sites/**/main.js` tries to support some Electron idioms.  
 * federation of the applet packaging using ES6 modules [is being explored](https://github.com/kfix/MacPin/issues/31)
 
@@ -74,8 +74,7 @@ Work is ongoing to make editing and creating app scripts easier, without requiri
 
 ## App porting issues
 
-* DRM: Many sites (Spotify, Netflix) are using Chrome/FF only DRMs (Widevine) but Apple-built WebKit only supports FairPlay DRM.
-* WebRTC: WebKit is compatible with [H264 & VP8 codecs](https://webkit.org/blog/8672/on-the-road-to-webrtc-1-0-including-vp8/), but Google Chrome is pushing hardware-unaccelerated VP9 on all fronts (incl. general `<video>`).
+* DRM: Many content-streaming sites use ["Widevine" DRM](https://en.wikipedia.org/wiki/Widevine) but WebKit only support FairPlay DRM.
 
 ### sample main.js
 ```
@@ -96,7 +95,7 @@ app.on('AppFinishedLaunching', function() {
 ```
 
 ## Hacking MacPin
-Building `main` branch requires macOS 11 "Big Sur" with Xcode 12.5+.
+Building `main` branch requires [macOS 13 "Ventura" with Xcode 14+](https://developer.apple.com/xcode/system-requirements/).
 
 All other branches are obsolete & archived for users locked on older macOS (hardware),  
 but they will recieve no updates.  
diff --git a/Sources/MacPin/WebView.swift b/Sources/MacPin/WebView.swift
index 5a0e7e5..9ce2708 100644
--- a/Sources/MacPin/WebView.swift
+++ b/Sources/MacPin/WebView.swift
@@ -21,6 +21,19 @@ extension WKWebView {
 	func wkclone(_ options: MPWebViewConfigOptions...) -> MPWebView {
 		return (self as! MPWebView).clone(options)
 	}
+
+	@nonobjc func gotoURL(_ url: NSURL) { gotoURL(url as URL) }
+	func gotoURL(_ url: URL) {
+		let act = ProcessInfo.processInfo.beginActivity(options: [ProcessInfo.ActivityOptions.userInitiated, ProcessInfo.ActivityOptions.idleSystemSleepDisabled], reason: "browsing begun")
+		if url.scheme == "file", #available(OSX 10.11, iOS 9.1, *) {
+			let readURL = url.deletingLastPathComponent()
+			warn("Bypassing CORS: \(readURL)")
+			loadFileURL(url as URL, allowingReadAccessTo: readURL)
+		} else {
+			load(URLRequest(url: url))
+		}
+		ProcessInfo.processInfo.endActivity(act)
+	}
 }
 
 enum MPWebViewConfigOptions {
@@ -269,7 +282,7 @@ extension MPWebViewConfigOptions: RawRepresentable, Hashable {
 	//   https://github.com/WebKit/webkit/blob/master/Source/JavaScriptCore/API/JSWrapperMap.mm#L258
 	@objc(evalJS::) func evalJS(_ js: String, callback: JSValue?)
 	@objc(asyncEvalJS:::) func asyncEvalJS(_ js: String, delay: Int, callback: JSValue?)
-	func loadURL(_ urlstr: String) -> Bool
+	func load_url(_ urlstr: String) -> Bool
 	func loadIcon(_ icon: String) -> Bool
 	func popStyle(_ idx: Int)
 	func style(_ css: String) -> Bool
@@ -291,8 +304,7 @@ extension MPWebViewConfigOptions: RawRepresentable, Hashable {
 // https://github.com/apple/swift-evolution/blob/master/proposals/0195-dynamic-member-lookup.md
 // https://github.com/apple/swift-evolution/blob/master/proposals/0216-dynamic-callable.md
 
-@objcMembers
-class MPWebView: WKWebView, WebViewScriptExports {
+final class MPWebView: WKWebView, WebViewScriptExports {
 
 	//@objc dynamic var isLoading: Bool
 	//@objc dynamic var estimatedProgress: Double
@@ -331,7 +343,7 @@ class MPWebView: WKWebView, WebViewScriptExports {
 
 	override var urlstr: String { // accessor for JSC, which doesn't support `new URL()`
 		get { return url?.absoluteString ?? "" }
-		set { loadURL(newValue) }
+		set { load_url(newValue) }
 	}
 
 	var userAgent: String {
@@ -407,7 +419,6 @@ class MPWebView: WKWebView, WebViewScriptExports {
 	var inspector: _WKInspector? {
 		get {
 			if WebKit_version >= (607, 1, 3) {
-				// https://github.com/WebKit/webkit/commit/1f7d382aa1e6fc67476787ce6a7b9a791b32f434
 				return _inspector
 			} else {
 				return nil
@@ -427,7 +438,6 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		}
 	}
 
-
 	var inspectorAttachmentView: NSView? {
 		// when inspector is open, subviews.first is actually the inspector (WKWebInspectorWKWebView), not the WKView
 		// tabitem.view.subviews = [ WKWebInspectorView, WKView, ... ]
@@ -563,7 +573,7 @@ class MPWebView: WKWebView, WebViewScriptExports {
 				}
 			}
 		}
-		let prefs = WKPreferences() // http://trac.webkit.org/browser/trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm
+		let prefs = WKPreferences() // https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
 #if os(OSX)
 		prefs._developerExtrasEnabled = true // Enable "Inspect Element" in context menu
 		prefs._fullScreenEnabled = true
@@ -595,6 +605,14 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		if !caching, #available(macOS 10.13.4, *) {
 			prefs._usesPageCache = false
 		}
+
+		// https://github.com/home-assistant/iOS/issues/4044
+		// https://github.com/ahalekelly/iOS/commit/3712028
+		for feat in WKPreferences._features() {
+			if feat.key == "ScreenTimeEnabled" {
+				prefs._setEnabled(false, for: feat)
+			}
+		}
 #endif
 
 		if privacy {
@@ -616,19 +634,41 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		configuration.suppressesIncrementalRendering = false
 
 		var dataStore = privacy ? WKWebsiteDataStore.nonPersistent() : WKWebsiteDataStore.default()
-
-		if #available(macOS 10.14.4, iOS 12.2, *) {
-			let dataStoreConf = privacy ? _WKWebsiteDataStoreConfiguration(nonPersistentConfiguration: ()) : _WKWebsiteDataStoreConfiguration()
-
-			if let proxyURL = URL(string: proxy), !proxy.isEmpty {
-				dataStoreConf.httpProxy = proxyURL
-				warn("HTTP proxy: \(dataStoreConf.httpProxy?.absoluteString)")
+		// macOS14: https://webkit.org/blog/14423/building-profiles-with-new-webkit-api/
+		//  if isolated: WKWebsiteDataStore(forIdentifier: <UUID-or-string>)
+
+		// configure proxy settings, which is oddly-slaved to the dataStore's config
+		if #available(macOS 14.0, *) {
+			// https://developer.apple.com/documentation/network/proxyconfiguration
+			// seems like direct-to "plain" proxies are no longer on the menu
+
+			if let proxyURL = URL(string: proxy), !proxy.isEmpty,
+				let host = proxyURL.host, let port = proxyURL.port, let uport = UInt16(exactly: port) {
+				let endpoint = NWEndpoint.hostPort(
+					host: NWEndpoint.Host(host),
+					port: NWEndpoint.Port(integerLiteral: uport)
+				)
+				let proxyConf = ProxyConfiguration(
+					httpCONNECTProxy: endpoint,
+					tlsOptions: nil // FIXME: check port == 443 || scheme == https
+				)
+				warn("HTTP (CONNECT) proxy: \(endpoint)")
+				dataStore.proxyConfigurations.append(proxyConf)
 			}
-			if let sproxyURL = URL(string: sproxy), !sproxy.isEmpty {
-				dataStoreConf.httpsProxy = sproxyURL
-				warn("HTTPS proxy: \(dataStoreConf.httpsProxy?.absoluteString)")
+
+			if let sproxyURL = URL(string: sproxy), !sproxy.isEmpty,
+				let host = sproxyURL.host, let port = sproxyURL.port, let uport = UInt16(exactly: port) {
+				let endpoint = NWEndpoint.hostPort(
+					host: NWEndpoint.Host(host),
+					port: NWEndpoint.Port(integerLiteral: uport)
+				)
+				let proxyConf = ProxyConfiguration(
+					httpCONNECTProxy: endpoint,
+					tlsOptions: nil // FIXME: check port == 443 || scheme == https
+				)
+				warn("HTTPS (CONNECT) proxy: \(endpoint)")
+				dataStore.proxyConfigurations.append(proxyConf)
 			}
-			dataStore = dataStore._init(with: dataStoreConf)
 		}
 
 		//if #available(OSX 10.11, iOS 9, *) {
@@ -671,7 +711,6 @@ class MPWebView: WKWebView, WebViewScriptExports {
 #elseif os(iOS)
 		_applicationNameForUserAgent = "Version/10 Mobile/12F70 Safari/\(WebKit_version.major).\(WebKit_version.minor).\(WebKit_version.tiny)"
 #endif
-
 		var url: URL? = nil
 
 		for option in config.options {
@@ -739,7 +778,6 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		}
 
 		self.notifier = WebNotifier(self)
-
 		for originStr in authorizedOriginsForNotifications {
 			self.notifier?.authorizeNotifications(fromOrigin: URL(string: originStr))
 		}
@@ -898,27 +936,14 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		}
 	}
 
-	@nonobjc func gotoURL(_ url: NSURL) { gotoURL(url as URL) }
-	func gotoURL(_ url: URL) {
-		let act = ProcessInfo.processInfo.beginActivity(options: [ProcessInfo.ActivityOptions.userInitiated, ProcessInfo.ActivityOptions.idleSystemSleepDisabled], reason: "browsing begun")
-		if url.scheme == "file", #available(OSX 10.11, iOS 9.1, *) {
-			let readURL = url.deletingLastPathComponent()
-			warn("Bypassing CORS: \(readURL)")
-			loadFileURL(url as URL, allowingReadAccessTo: readURL)
-		} else {
-			load(URLRequest(url: url))
-		}
-		ProcessInfo.processInfo.endActivity(act)
-	}
-
 	@discardableResult
-	func loadURL(_ urlstr: String) -> Bool {
+	func load_url(_ urlstr: String) -> Bool {
 		if let url = URL(string: urlstr) {
 			gotoURL(url)
 			return true
 		}
 		warn("ILLEGAL URL! \(url)") // getting SIGILLd by incomplete URLs:
-		// $.browser.tabs[0].loadURL("www.example.com")
+		// $.browser.tabs[0].load_url("www.example.com")
 		return false // tell JS we were given a malformed URL
 	}
 
@@ -1182,6 +1207,11 @@ class MPWebView: WKWebView, WebViewScriptExports {
 		// https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSView_Class/index.html#//apple_ref/occ/instm/NSView/beginDraggingSessionWithItems:event:source:
 	}
 */
+	//override func _updateScreenTimeBasedOnWindowVisibility() {
+	//    // https://github.com/WebKit/WebKit/blob/101392f63ca9966babdf9757a1a85793f2b38073/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm#L504
+	//    // this is constantly being called .... *sigh**
+	//    super._updateScreenTimeBasedOnWindowVisibility()
+	//}
 
 	//func dumpImage() -> NSImage { return NSImage(data: view.dataWithPDFInsideRect(view.bounds)) }
 	//var snapshotURL: String { get { NSImage(data: thumbnail.dataWithPDFInsideRect(thumbnail.bounds)) } } //data::
@@ -1327,7 +1357,7 @@ extension MPWebView { // NSTextFinderClient
 		warn(obj: scrollBox)
 		//_setFrame(frame, andScrollBy: scrollBox) // WebKit availability?
 		//scrollRangeToVisible(range)
-    }
+	}
 
 	// https://developer.apple.com/documentation/appkit/nstextfinderclient/1526989-scrollrangetovisible
 	@objc override public func scrollRangeToVisible(_ range: NSRange) {
diff --git a/Sources/MacPin/WebViewCallbacks.swift b/Sources/MacPin/WebViewCallbacks.swift
index d13fd73..308d1f8 100644
--- a/Sources/MacPin/WebViewCallbacks.swift
+++ b/Sources/MacPin/WebViewCallbacks.swift
@@ -31,6 +31,7 @@ struct WebViewUICallbacks {
 
 	static func makeClient() -> WKPageUIClientV2 {
 		var uiClient = WKPageUIClientV2()
+		// https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/PageClient.h
 		uiClient.base.version = 2
 #if os(OSX)
 		uiClient.decidePolicyForGeolocationPermissionRequest = decidePolicyForGeolocationPermissionRequestCallBack
@@ -44,6 +45,7 @@ struct WebViewUICallbacks {
 
 		// V6:
 		//  checkUserMediaPermissionForOrigin = checkUserMediaPermissionCallback
+        //    ^ want this -- don't wanna add SSL to my home assistant to use my macbook microphone with it
 		//	decidePolicyForUserMediaPermissionRequest = decidePolicyForUserMediaPermissionRequest
 
 		// V9:
@@ -62,7 +64,7 @@ struct WebViewUICallbacks {
 	}
 
 	static func subscribe(_ webview: MPWebView) {
-		warn("UI")
+		warn("subscribe to UI callbacks")
 		var uiClient = makeClient()
 		uiClient.base.clientInfo = UnsafeRawPointer(Unmanaged.passUnretained(webview).toOpaque()) // +0
 		guard let page = webview._page else { return }
diff --git a/Sources/MacPin/WebViewController.swift b/Sources/MacPin/WebViewController.swift
index beeaf25..638eaff 100644
--- a/Sources/MacPin/WebViewController.swift
+++ b/Sources/MacPin/WebViewController.swift
@@ -7,7 +7,6 @@ import WebKitPrivates
 import JavaScriptCore
 
 // https://github.com/apple/swift-evolution/blob/master/proposals/0160-objc-inference.md#re-enabling-objc-inference-within-a-class-hierarchy
-@objcMembers
 class WebViewController: ViewController { //, WebViewControllerScriptExports {
 	@objc unowned var webview: MPWebView
 
@@ -38,7 +37,7 @@ class WebViewController: ViewController { //, WebViewControllerScriptExports {
 		//webview._historyDelegate = self
 
 #if DEBUG
-		//webview._diagnosticLoggingDelegate = self
+		webview._diagnosticLoggingDelegate = self
 #endif
 		webview.configuration.processPool._downloadDelegate = self
 		webview.configuration.processPool._setCanHandleHTTPSServerTrustEvaluation(true)
diff --git a/Sources/MacPin/WebViewDelegates.swift b/Sources/MacPin/WebViewDelegates.swift
index b245a82..c38595d 100644
--- a/Sources/MacPin/WebViewDelegates.swift
+++ b/Sources/MacPin/WebViewDelegates.swift
@@ -61,7 +61,7 @@ extension AppScriptRuntime: WKScriptMessageHandler {
 
 	// FUTURE: didPerformClientRedirectForNavigation https://github.com/WebKit/webkit/commit/9475f62f3602aa91309f00c64e4430a25d5ae4e9
 
-	func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+	@objc func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
 		if let url = webView.url {
 			warn("'\(url)'")
 			// check url against regex'd keys of MatchedAddressOptions
@@ -72,7 +72,7 @@ extension AppScriptRuntime: WKScriptMessageHandler {
 #endif
 	}
 
-	func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+	@objc func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
 		//navigationAction ._originalURL ._userInitiated ._canHandleRequest 13+:._isRedirect 11+:._shouldOpenExternalSchemes 11+:._shouldOpenAppLinks
 		if let url = navigationAction.request.url, let scheme = url.scheme {
 			switch scheme {
@@ -146,13 +146,13 @@ extension AppScriptRuntime: WKScriptMessageHandler {
 		}
 	}
 
-	func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
+	@objc func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
 		guard let url = webView.url else { return }
 		warn("~> [\(url)]")
 		browsingReactor.anyHandled(.receivedRedirectionToURL, url.absoluteString as NSString, webView)
 	}
 
-	func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { //error returned by webkit when loading content
+	@objc func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { //error returned by webkit when loading content
 		let url = webView.url ?? URL(string: "about:nil-url")! // no URL? pish-posh!
 		// maybe if webView.loadData was used...
 		//	& the anon-URL data had a head/metadata redirect to a URL, which failed. oic wut u did there
@@ -258,7 +258,8 @@ extension AppScriptRuntime: WKScriptMessageHandler {
 		//content starts arriving...I assume <body> has materialized in the DOM?
 	}
 
-	func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+	@objc func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+	    warn("")
 		let mime = navigationResponse.response.mimeType!
 		let url = navigationResponse.response.url!
 		let fn = navigationResponse.response.suggestedFilename!
diff --git a/Sources/MacPinOSX/AppDelegateOSX.swift b/Sources/MacPinOSX/AppDelegateOSX.swift
index c8db3ff..a80cbbd 100644
--- a/Sources/MacPinOSX/AppDelegateOSX.swift
+++ b/Sources/MacPinOSX/AppDelegateOSX.swift
@@ -421,7 +421,7 @@ public class MacPinAppDelegateOSX: NSObject, MacPinAppDelegate {
 				case "com.apple.web-internet-location": //.webloc http://stackoverflow.com/questions/146575/crafting-webloc-file
 					if let webloc = NSDictionary(contentsOfFile: filename), let urlstr = webloc.value(forKey: "URL") as? String {
 						if AppScriptRuntime.shared.anyHandled(.handleDragAndDroppedURLs, [urlstr]) {
-					 		return true  // app.js indicated it handled drag itself
+							return true  // app.js indicated it handled drag itself
 						} else if let url = validateURL(urlstr) {
 							browserController.tabSelected = MPWebView(url: url)
 							return true
diff --git a/Sources/MacPinOSX/BrowserViewControllerOSX.swift b/Sources/MacPinOSX/BrowserViewControllerOSX.swift
index 6ce69fc..2d49419 100644
--- a/Sources/MacPinOSX/BrowserViewControllerOSX.swift
+++ b/Sources/MacPinOSX/BrowserViewControllerOSX.swift
@@ -359,15 +359,15 @@ struct WeakThing<T: AnyObject> {
 
 #if DEBUG
 extension TabViewController: NSViewControllerPresentationAnimator {
-    public func animatePresentation(of viewController: NSViewController, from fromViewController: NSViewController) {
-    	warn(fromViewController)
-    	warn(viewController)
-    	super.transition(from: fromViewController, to: viewController, options: transitionOptions, completionHandler: nil)
-    }
-
-    public func animateDismissal(of viewController: NSViewController, from fromViewController: NSViewController) {
-    	warn()
-    }
+	public func animatePresentation(of viewController: NSViewController, from fromViewController: NSViewController) {
+		warn(fromViewController)
+		warn(viewController)
+		super.transition(from: fromViewController, to: viewController, options: transitionOptions, completionHandler: nil)
+	}
+
+	public func animateDismissal(of viewController: NSViewController, from fromViewController: NSViewController) {
+		warn()
+	}
 }
 #endif
 
@@ -585,7 +585,7 @@ class BrowserViewControllerOSX: TabViewController, BrowserViewController {
 					}
 					if let tvi = self.tabViewItem(for: vc) {
 						let idx = self.tabView.indexOfTabViewItem(tvi)
-						warn(idx.description)
+						warn(idx.description) // looks corrupt: >> [tabSelected] 9223372036854775807
 						if idx != Int.max && idx > -1 {
 							self.selectedTabViewItemIndex = idx
 							prepareTab(vc)
@@ -594,6 +594,11 @@ class BrowserViewControllerOSX: TabViewController, BrowserViewController {
 				case let wv as MPWebView: // find the view's existing controller or else make one and re-assign
 					self.tabSelected = self.children.filter({ ($0 as? WebViewControllerOSX)?.webview === wv }).first as? WebViewControllerOSX ?? WebViewControllerOSX(webview: wv)
 					//FIXME: a backref in the wv to wvc would be helpful
+				case let wv as WKWebView:
+					let vc = NSViewController(nibName:nil, bundle:nil)
+					vc.view = wv
+					vc.representedObject = wv
+					self.tabSelected = vc
 				//case let js as JSValue: guard let wv = js.toObjectOfClass(MPWebView.self) { self.tabSelected = wv } //custom bridging coercion
 				default:
 					warn("invalid object")
@@ -687,7 +692,7 @@ class BrowserViewControllerOSX: TabViewController, BrowserViewController {
 	}
 
 	func prepareTab(_ viewController: NSViewController) {
-		guard let webview = viewController.representedObject as? MPWebView else {
+		guard let webview = viewController.representedObject as? WKWebView else {
 			warn("making plain view first responder!!!")
 			view.window?.makeFirstResponder(viewController.view)
 			return
diff --git a/Sources/MacPinOSX/FoundationExts.swift b/Sources/MacPinOSX/FoundationExts.swift
index 2aeb2bd..49e82a4 100644
--- a/Sources/MacPinOSX/FoundationExts.swift
+++ b/Sources/MacPinOSX/FoundationExts.swift
@@ -63,7 +63,7 @@ extension NSPasteboard {
 					// https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/UTIRef/Articles/System-DeclaredUniformTypeIdentifiers.html
 					// http://arstechnica.com/apple/2005/04/macosx-10-4/11/ http://www.cocoanetics.com/2012/09/fun-with-uti/
 					if !uti.rawValue.isEmpty, let value = item.string(forType: uti) {
-				 		if let cfdesc = UTTypeCopyDescription(uti as CFString), let cfmime = UTTypeCopyPreferredTagWithClass(uti as CFString, kUTTagClassMIMEType) {
+						if let cfdesc = UTTypeCopyDescription(uti as CFString), let cfmime = UTTypeCopyPreferredTagWithClass(uti as CFString, kUTTagClassMIMEType) {
 							let desc = cfdesc.takeUnretainedValue()
 							let mime = cfmime.takeUnretainedValue()
 							warn("DnD: uti(\(uti)) `\(desc)` => types['\(mime)'] = '\(value)'")
diff --git a/Sources/MacPinOSX/OmniBoxController.swift b/Sources/MacPinOSX/OmniBoxController.swift
index 98af275..0eff893 100644
--- a/Sources/MacPinOSX/OmniBoxController.swift
+++ b/Sources/MacPinOSX/OmniBoxController.swift
@@ -30,7 +30,7 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 		var bezel: NSBezierPath = NSBezierPath(roundedRect: NSInsetRect(bounds, 2, 2), xRadius: 5, yRadius: 5)
 			// approximating the geo of 10.10's .roundedBezel
 			NSColor.darkGray.set(); bezel.stroke() // draw bezel
-	    	bezel.addClip() // constrain further drawing within bezel
+			bezel.addClip() // constrain further drawing within bezel
 
 		if isLoading {
 			// draw a Safari style progress-line along edge of the text box's focus ring
@@ -45,7 +45,7 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 			NSColor.systemBlue.set() // matches "Highlight Color: Blue" from SysPrefs:General
 			progressRect.fill(using: .sourceOver)
 		} else {
-	    	NSColor.clear.setFill() // clear background
+			NSColor.clear.setFill() // clear background
 			bounds.fill(using: .copy) // .clear
 		}
 
@@ -75,7 +75,7 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 
 @objc class OmniBoxController: NSViewController {
 	let urlbox = URLAddressField()
-	@objc weak var webview: MPWebView? = nil {
+	@objc weak var webview: WKWebView? = nil {
 		didSet { //KVC to copy updates to webviews url & title (user navigations, history.pushState(), window.title=)
 			if let wv = webview {
 				view.bind(NSBindingName.toolTip, to: wv, withKeyPath: #keyPath(MPWebView.title), options: nil)
@@ -106,7 +106,7 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 	override init(nibName nibNameOrNil: NSNib.Name?, bundle nibBundleOrNil: Bundle?) { super.init(nibName:nil, bundle:nil) } // calls loadView()
 	override func loadView() { view = urlbox } // NIBless
 
-	func popup(_ webview: MPWebView?) {
+	func popup(_ webview: WKWebView?) {
 		guard let webview = webview else { return }
 		MacPinApp.shared.appDelegate?.browserController.tabSelected = webview // EWW
 	}
@@ -126,7 +126,7 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
- 		// prepareForReuse() {...} ?
+		// prepareForReuse() {...} ?
 
 		urlbox.isBezeled = true
 		urlbox.bezelStyle = .roundedBezel
@@ -180,12 +180,17 @@ class URLAddressField: NSTextField { // FIXMEios UILabel + UITextField
 			//FIXME: it should be able to return URL<->NSURL
 			return searchForKeywords(urlstr)
 		}){
-			if let wv = webview { // FIXME: Selector(gotoURL:) to nextResponder
+			if let wv = webview as? MPWebView { // FIXME: Selector(gotoURL:) to nextResponder
 				wv.notifier?.authorizeNotifications(fromOrigin: url) // user typed this address in so they "trust" it to not be spammy?
 				view.window?.makeFirstResponder(wv) // no effect if this vc was brought up as a modal sheet
 				warn(url.description)
 				wv.gotoURL(url)
-				cancelOperation(self)
+				cancelOperation(self) // cancel our text-inputting session
+			} else if let wv = webview { // FIXME: Selector(gotoURL:) to nextResponder
+				view.window?.makeFirstResponder(wv) // no effect if this vc was brought up as a modal sheet
+				warn(url.description)
+				wv.gotoURL(url)
+				cancelOperation(self) // cancel our text-inputting session
 			} else if let parent = parent { // tab-less browser window ...
 				parent.addChild(WebViewControllerOSX(webview: MPWebView(url: url))) // is parentVC the toolbar or contentView VC??
 			} else if let presenter = presentingViewController { // urlbox is a popover/sheet ...
diff --git a/Sources/MacPinOSX/WebViewDelegatesOSX.swift b/Sources/MacPinOSX/WebViewDelegatesOSX.swift
index e07c974..feea498 100644
--- a/Sources/MacPinOSX/WebViewDelegatesOSX.swift
+++ b/Sources/MacPinOSX/WebViewDelegatesOSX.swift
@@ -8,7 +8,7 @@ import AVFoundation
 
 @objc extension WebViewControllerOSX: WKUIDelegate {
 
-	func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
+	@objc func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
 		//focus()
 			// tab switches, but re-draw of webview is frozen because webthread is stuck waiting for this delegated call to finish...
 		let alert = NSAlert()
@@ -20,7 +20,7 @@ import AVFoundation
 		displayAlert(alert) { (response: NSApplication.ModalResponse) -> Void in completionHandler() }
 	}
 
-	func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
+	@objc func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
 		let alert = NSAlert()
 		alert.messageText = webView.title ?? ""
 		alert.addButton(withTitle: "OK")
@@ -30,7 +30,7 @@ import AVFoundation
 		displayAlert(alert) { (response: NSApplication.ModalResponse) -> Void in completionHandler(response == .alertFirstButtonReturn ? true : false) }
 	}
 
-	func webView(_ webView: WKWebView, runJavaScriptTextInputPanelWithPrompt prompt: String, defaultText: String?, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (String?) -> Void) {
+	@objc func webView(_ webView: WKWebView, runJavaScriptTextInputPanelWithPrompt prompt: String, defaultText: String?, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (String?) -> Void) {
 		let alert = NSAlert()
 		alert.messageText = webView.title ?? ""
 		alert.addButton(withTitle: "Submit")
@@ -39,12 +39,12 @@ import AVFoundation
 		let input = NSTextField(frame: NSMakeRect(0, 0, 200, 24))
 		input.stringValue = defaultText ?? ""
 		input.isEditable = true
- 		alert.accessoryView = input
+		alert.accessoryView = input
 		displayAlert(alert) { (response: NSApplication.ModalResponse) -> Void in completionHandler(input.stringValue) }
 	}
 
 	@available(OSX 10.12, *)
-	func webView(_ webView: WKWebView, runOpenPanelWith parameters: WKOpenPanelParameters, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping ([URL]?) -> Void) {
+	@objc func webView(_ webView: WKWebView, runOpenPanelWith parameters: WKOpenPanelParameters, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping ([URL]?) -> Void) {
 		// WKOpenPanel for <input> file uploading
 		// https://bugs.webkit.org/show_bug.cgi?id=137759
 		// https://github.com/WebKit/webkit/blob/4b7052ab44fa581810188638d1fdf074e7d754ca/Tools/MiniBrowser/mac/WK2BrowserWindowController.m#L451
@@ -106,21 +106,21 @@ extension WebViewControllerOSX {
 
 		let userbox = NSTextField(frame: NSMakeRect(0, 40, 200, 24))
 		userbox.stringValue = "Enter user"
- 		if let cred = challenge.proposedCredential {
+		if let cred = challenge.proposedCredential {
 			if let user = cred.user { userbox.stringValue = user }
 		}
 		userbox.isEditable = true
 
 		let passbox = NSTextField(frame: NSMakeRect(0, 0, 200, 24))
 		passbox.stringValue = "Enter password"
- 		if let cred = challenge.proposedCredential {
+		if let cred = challenge.proposedCredential {
 			if cred.hasPassword { passbox.stringValue = cred.password! }
 		}
 		passbox.isEditable = true
 
 		prompts.subviews = [userbox, passbox]
 
- 		alert.accessoryView = prompts
+		alert.accessoryView = prompts
 
 		//alert.beginSheetModalForWindow(webView.window!, completionHandler:{(response: NSApplication.ModalResponse) -> Void in
 		displayAlert(alert) { (response: NSApplication.ModalResponse) -> Void in
@@ -136,7 +136,7 @@ extension WebViewControllerOSX {
 				completionHandler(.rejectProtectionSpace, nil)
 				webView.stopLoading()
 			}
- 		}
+		}
 	}
 }
 
@@ -144,7 +144,7 @@ extension WebViewControllerOSX {
 // https://github.com/WebKit/webkit/blob/master/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm
 // https://github.com/WebKit/webkit/blob/master/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
 extension WebViewControllerOSX { // _WKDownloadDelegate
-	override func _download(_ download: _WKDownload!, decideDestinationWithSuggestedFilename filename: String!, allowOverwrite: UnsafeMutablePointer<ObjCBool>) -> String! {
+	@objc override func _download(_ download: _WKDownload!, decideDestinationWithSuggestedFilename filename: String!, allowOverwrite: UnsafeMutablePointer<ObjCBool>) -> String! {
 		warn(download.description)
 		//pop open a save Panel to dump data into file
 		let saveDialog = NSSavePanel()
@@ -168,7 +168,7 @@ extension WebViewControllerOSX { // _WKDownloadDelegate
 }
 
 extension WebViewControllerOSX { // HTML5 fullscreen
-	func _webViewFullscreenMayReturn(toInline webView: WKWebView) {
+	@objc func _webViewFullscreenMayReturn(toInline webView: WKWebView) {
 		// https://developer.apple.com/reference/webkit/wkwebviewconfiguration/1614793-allowsinlinemediaplayback
 		warn()
 	}
@@ -179,10 +179,10 @@ extension WebViewControllerOSX { // HTML5 fullscreen
 	// https://github.com/WebKit/webkit/blob/master/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
 	//  https://github.com/WebKit/webkit/search?q=fullScreenWindowController
 	// https://github.com/WebKit/webkit/blob/master/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm
-	func _webViewDidEnterFullscreen(_ webView: WKWebView) {
+	@objc func _webViewDidEnterFullscreen(_ webView: WKWebView) {
 		warn("JS <\(webView.urlstr)>: `<video>.requestFullscreen(); // begun`")
 	}
-	func _webViewDidExitFullscreen(_ webView: WKWebView) {
+	@objc func _webViewDidExitFullscreen(_ webView: WKWebView) {
 		warn("JS <\(webView.urlstr)>: `<video>.requestFullscreen(); // finished`")
 	}
 }
@@ -200,7 +200,7 @@ extension WebViewControllerOSX { // _WKFindDelegate
 }
 
 extension WebViewController { // _WKInputDelegate
-	func _webView(_ webView: WKWebView!, didStart inputSession: _WKFormInputSession!) {
+	@objc func _webView(_ webView: WKWebView!, didStart inputSession: _WKFormInputSession!) {
 		//inputSession.valid .userObject .focusedElementInfo==[.Link,.Image]
 		warn()
 	}
@@ -302,14 +302,14 @@ extension WebViewController { // _WKInputDelegate
 		decisionHandler(true)
 	}
 
-	func _webView(_ webView: WKWebView!, mediaCaptureStateDidChange state: _WKMediaCaptureState) {
+	@objc func _webView(_ webView: WKWebView!, mediaCaptureStateDidChange state: _WKMediaCaptureState) {
 		warn()
 		//warn(obj: state)
 		// .activeCamera .activeMicrophone .mutedCamera .mutedMicrophone
 	}
 
 	// JS window.beforeunload() handler
-	func _webView(_ webView: WKWebView!, runBeforeUnloadConfirmPanelWithMessage message: String!, initiatedByFrame frame: WKFrameInfo!, completionHandler: ((Bool) -> Void)!) {
+	@objc func _webView(_ webView: WKWebView!, runBeforeUnloadConfirmPanelWithMessage message: String!, initiatedByFrame frame: WKFrameInfo!, completionHandler: ((Bool) -> Void)!) {
 		let alert = NSAlert()
 		alert.messageText = webView.title ?? ""
 		alert.addButton(withTitle: "Leave Page")
@@ -320,7 +320,7 @@ extension WebViewController { // _WKInputDelegate
 		displayAlert(alert) { (response: NSApplication.ModalResponse) -> Void in completionHandler(response == .alertFirstButtonReturn) }
 	}
 
-	func _webView(_ webView: WKWebView, printFrame: WKFrameInfo) {
+	@objc func _webView(_ webView: WKWebView, printFrame: WKFrameInfo) {
 		warn("JS: `window.print();`")
 		(webView as? MPWebView)?.printWebView(nil)
 	}
diff --git a/Sources/MacPin_stub/main.swift b/Sources/MacPin_stub/main.swift
index 3459c8b..fbae696 100644
--- a/Sources/MacPin_stub/main.swift
+++ b/Sources/MacPin_stub/main.swift
@@ -47,7 +47,7 @@ if let sharedURL = FileManager.default.containerURL(forSecurityApplicationGroupI
 	// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_application-groups
 	// print("\(sharedURL)") // could load self-modified, user customized, main.js's from here
 }
-	
+
 if !loadMPframework(fromBundle: mainBundle) {
 	// not found locally, so search for the LaunchServices-registered MacPin.app
 	// https://github.com/chromium/chromium/blob/master/chrome/app_shim/chrome_main_app_mode_mac.mm
diff --git a/eXcode.mk b/eXcode.mk
index 1a405e8..524bddf 100644
--- a/eXcode.mk
+++ b/eXcode.mk
@@ -19,7 +19,7 @@ archs_iphonesimulator	?= $(archs_macosx)
 archs_iphoneos		?= arm64
 arch				?= $(shell uname -m)
 
-target_ver_macos	?= 11.6
+target_ver_macos	?= 13.0
 # can we get the running version, if not pre-set?
 target_macos		?= apple-macosx$(target_ver_macos)
 target_ver_ios		?= 13.0
@@ -72,9 +72,13 @@ verbose				?=
 ###################
 # https://github.com/apple/swift-driver
 ifeq (1,$(CLTOOLS))
-sdkpath				:= /$(shell pkgutil --volume / --only-dirs --files com.apple.pkg.CLTools_SDK_macOS110 | grep -m1 MacOSX11.3.sdk$$)
+sdkpath				:= /$(shell pkgutil --volume / --only-dirs --regexp --files com.apple.pkg.CLTools.* | grep -m1 -E SDKs/MacOSX\\d+.*.sdk$$)
+$(info [$(eXcode)] $$(sdkpath) := $(sdkpath))
 swiftc				:= /$(shell pkgutil --volume / --only-dirs --files com.apple.pkg.CLTools_Executables | grep -m1 usr/bin$$)/swiftc -sdk $(sdk) -target $(arch)-$(target_$(platform)) $(verbose)
-swiftbuildbin		:= /$(patsubst %-build,%,$(shell pkgutil --volume / --only-files --files com.apple.pkg.CLTools_Executables | grep -m1 bin/swift-build$$))
+
+# not a thing anymore
+#swiftbuildbin		:= /$(patsubst %-build,%,$(shell pkgutil --volume / --only-files --files com.apple.pkg.CLTools_Executables | grep -m1 bin/swift-build$$))
+swiftbuildbin		:= /usr/bin/swift
 ### XXX: appears CLTools doesn't ship SPM libraries yet, so Package.swift can't be compiled
 else
 sdkpath				:= $(shell xcrun --show-sdk-path --sdk $(sdk))
diff --git a/modules/WebKitPrivates/WKPreferencesPrivate.h b/modules/WebKitPrivates/WKPreferencesPrivate.h
index d04c4b0..edd7720 100644
--- a/modules/WebKitPrivates/WKPreferencesPrivate.h
+++ b/modules/WebKitPrivates/WKPreferencesPrivate.h
@@ -51,6 +51,7 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
     _WKEditableLinkBehaviorNeverLive,
 } WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
 
+@class _WKFeature;
 @class _WKExperimentalFeature;
 @class _WKInternalDebugFeature;
 
@@ -130,15 +131,21 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
 
 @property (nonatomic, setter=_setAVFoundationEnabled:) BOOL _avFoundationEnabled WK_API_AVAILABLE(macos(10.10), ios(12.0));
 
+@property (nonatomic, setter=_setTextExtractionEnabled:) BOOL _textExtractionEnabled WK_API_AVAILABLE(macos(15.0), ios(18.0), visionos(2.0));
+
++ (NSArray<_WKFeature *> *)_features WK_API_AVAILABLE(macos(13.3), ios(16.4));
+- (BOOL)_isEnabledForFeature:(_WKFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
+- (void)_setEnabled:(BOOL)value forFeature:(_WKFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
+
 + (NSArray<_WKInternalDebugFeature *> *)_internalDebugFeatures WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 - (BOOL)_isEnabledForInternalDebugFeature:(_WKInternalDebugFeature *)feature WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 - (void)_setEnabled:(BOOL)value forInternalDebugFeature:(_WKInternalDebugFeature *)feature WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 
 + (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures WK_API_AVAILABLE(macos(10.12), ios(10.0));
-- (BOOL)_isEnabledForFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
-- (void)_setEnabled:(BOOL)value forFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
 - (BOOL)_isEnabledForExperimentalFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
 - (void)_setEnabled:(BOOL)value forExperimentalFeature:(_WKExperimentalFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
+- (void)_disableRichJavaScriptFeatures;
+- (void)_disableMediaPlaybackRelatedFeatures;
 
 @property (nonatomic, setter=_setShouldEnableTextAutosizingBoost:) BOOL _shouldEnableTextAutosizingBoost WK_API_AVAILABLE(macos(10.14), ios(12.0));
 
diff --git a/modules/WebKitPrivates/WKWebView+Privates.h b/modules/WebKitPrivates/WKWebView+Privates.h
index 3183fad..8f26566 100644
--- a/modules/WebKitPrivates/WKWebView+Privates.h
+++ b/modules/WebKitPrivates/WKWebView+Privates.h
@@ -210,6 +210,10 @@ typedef NS_OPTIONS(NSInteger, _WKMediaMutedState) {
 
 @property (nonatomic, setter=_setMediaCaptureEnabled:) BOOL _mediaCaptureEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
 
+- (void)_uninstallScreenTimeWebpageController;
+- (void)_updateScreenTimeViewGeometry;
+- (void)_updateScreenTimeBasedOnWindowVisibility;
+
 #if !TARGET_OS_IPHONE
 @property (nonatomic, readonly) BOOL _hasInspectorFrontend WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 @property (nonatomic, readonly) _WKInspector *_inspector WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
diff --git a/modules/WebKitPrivates/WebFeature.h b/modules/WebKitPrivates/WebFeature.h
new file mode 100644
index 0000000..902a070
--- /dev/null
+++ b/modules/WebKitPrivates/WebFeature.h
@@ -0,0 +1,86 @@
+/*
+ * https://github.com/WebKit/WebKit/blob/main/Source/WebKitLegacy/mac/WebView/WebFeature.h
+ *
+ * Copyright (C) 2020-2023 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ @enum WebFeatureStatus
+ @abstract Field indicating the purpose and level of completeness of a web feature. Used to determine which UI (if any) should reveal a feature.
+ */
+typedef NS_ENUM(NSUInteger, WebFeatureStatus) {
+    /// For customizing WebKit behavior in embedding applications.
+    WebFeatureStatusEmbedder,
+    /// Feature in active development. Unfinished, no promise it is usable or safe.
+    WebFeatureStatusUnstable,
+    /// Tools for debugging the WebKit engine. Not generally useful to web developers.
+    WebFeatureStatusInternal,
+    /// Tools for web developers.
+    WebFeatureStatusDeveloper,
+    /// Enabled by default in test infrastructure, but not ready to ship yet.
+    WebFeatureStatusTestable,
+    /// Enabled by default in Safari Technology Preview, but not considered ready to ship yet.
+    WebFeatureStatusPreview,
+    /// Enabled by default and ready for general use.
+    WebFeatureStatusStable,
+    /// Enabled by default and in general use for more than a year.
+    WebFeatureStatusMature
+};
+
+/*!
+ @enum WebFeatureCategory
+ @abstract Field indicating the category of a web feature. Used to determine how a feature should be sorted or grouped in the UI.
+ */
+typedef NS_ENUM(NSUInteger, WebFeatureCategory) {
+    WebFeatureCategoryNone = 0,
+    WebFeatureCategoryAnimation = 1,
+    WebFeatureCategoryCSS = 2,
+    WebFeatureCategoryDOM = 3,
+    WebFeatureCategoryJavascript = 4,
+    WebFeatureCategoryMedia = 5,
+    WebFeatureCategoryNetworking = 6,
+    WebFeatureCategoryPrivacy = 7,
+    WebFeatureCategorySecurity = 8,
+    WebFeatureCategoryHTML = 9,
+    WebFeatureCategoryExtensions = 10,
+};
+
+@interface WebFeature : NSObject
+
+@property (nonatomic, readonly, copy) NSString *key;
+@property (nonatomic, readonly, copy) NSString *preferenceKey;
+@property (nonatomic, readonly, copy) NSString *name;
+@property (nonatomic, readonly) WebFeatureStatus status;
+@property (nonatomic, readonly) WebFeatureCategory category;
+@property (nonatomic, readonly, copy) NSString *details;
+@property (nonatomic, readonly) BOOL defaultValue;
+@property (nonatomic, readonly, getter=isHidden) BOOL hidden;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/modules/WebKitPrivates/_WKFeature.h b/modules/WebKitPrivates/_WKFeature.h
new file mode 100644
index 0000000..94d8b7c
--- /dev/null
+++ b/modules/WebKitPrivates/_WKFeature.h
@@ -0,0 +1,43 @@
+/*
+ * https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/API/Cocoa/_WKFeature.h
+ *
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
+#import "WebFeature.h"
+
+WK_CLASS_AVAILABLE(macos(13.3), ios(16.4))
+@interface _WKFeature : NSObject
+
+@property (nonatomic, readonly, copy) NSString *key;
+@property (nonatomic, readonly, copy) NSString *name;
+@property (nonatomic, readonly) WebFeatureStatus status;
+@property (nonatomic, readonly) WebFeatureCategory category;
+@property (nonatomic, readonly, copy) NSString *details;
+@property (nonatomic, readonly) BOOL defaultValue;
+@property (nonatomic, readonly, getter=isHidden) BOOL hidden;
+
+@end
diff --git a/modules/WebKitPrivates/_WKInspector.h b/modules/WebKitPrivates/_WKInspector.h
index c48d3c6..bb1da6b 100644
--- a/modules/WebKitPrivates/_WKInspector.h
+++ b/modules/WebKitPrivates/_WKInspector.h
@@ -1,7 +1,7 @@
 /*
- * https://github.com/WebKit/webkit/blob/main/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.h
+ * https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/API/Cocoa/_WKInspector.h
  *
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,17 +27,23 @@
 
 #import <Foundation/Foundation.h>
 #import <WebKit/WKFoundation.h>
+#import "_WKInspectorExtensionHost.h"
+#import "_WKInspectorIBActions.h"
+
+NS_ASSUME_NONNULL_BEGIN
 
 @class WKWebView;
 @class _WKFrameHandle;
-
-NS_ASSUME_NONNULL_BEGIN
+@class _WKInspectorExtension;
+@protocol _WKInspectorDelegate;
 
 WK_CLASS_AVAILABLE(macos(10.14.4), ios(12.2))
-@interface _WKInspector : NSObject
+@interface _WKInspector : NSObject <_WKInspectorExtensionHost, _WKInspectorIBActions>
 
 - (instancetype)init NS_UNAVAILABLE;
 
+@property (nonatomic, weak) id <_WKInspectorDelegate> delegate WK_API_AVAILABLE(macos(12.0), ios(15.0));
+
 @property (nonatomic, readonly) WKWebView *webView;
 @property (nonatomic, readonly) BOOL isConnected;
 @property (nonatomic, readonly) BOOL isVisible;
@@ -46,11 +52,7 @@ WK_CLASS_AVAILABLE(macos(10.14.4), ios(12.2))
 @property (nonatomic, readonly) BOOL isElementSelectionActive;
 
 - (void)connect;
-- (void)show;
 - (void)hide;
-- (void)close;
-- (void)showConsole;
-- (void)showResources;
 - (void)showMainResourceForFrame:(_WKFrameHandle *)frame;
 - (void)attach;
 - (void)detach;
diff --git a/modules/WebKitPrivates/_WKInspectorExtensionHost.h b/modules/WebKitPrivates/_WKInspectorExtensionHost.h
new file mode 100644
index 0000000..38bf989
--- /dev/null
+++ b/modules/WebKitPrivates/_WKInspectorExtensionHost.h
@@ -0,0 +1,85 @@
+/*
+ * https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorExtensionHost.h
+ *
+ * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class WKWebView;
+@class _WKInspectorExtension;
+
+@protocol _WKInspectorExtensionHost <NSObject>
+@optional
+
+/**
+ * @abstract Registers a Web Extension with the associated Web Inspector.
+ * @param extensionID A unique identifier for the extension.
+ * @param extensionBundleIdentifier A bundle identifier for the extension.
+ * @param displayName A localized display name for the extension.
+ * @param completionHandler The completion handler to be called when registration succeeds or fails.
+ *
+ * Web Extensions in Web Inspector are active as soon as they are registered.
+ */
+- (void)registerExtensionWithID:(NSString *)extensionID extensionBundleIdentifier:(NSString *)extensionBundleIdentifier displayName:(NSString *)displayName completionHandler:(void(^)(NSError * _Nullable, _WKInspectorExtension * _Nullable))completionHandler;
+
+/**
+ * @abstract Unregisters a Web Extension with the associated Web Inspector.
+ * @param extensionID A unique identifier for the extension.
+ * @param completionHandler The completion handler to be called when unregistering succeeds or fails.
+ *
+ * Unregistering an extension will automatically close any associated sidebars/tabs.
+ */
+- (void)unregisterExtension:(_WKInspectorExtension *)extension completionHandler:(void(^)(NSError * _Nullable))completionHandler;
+
+/**
+ * @abstract Opens the specified extension tab in the associated Web Inspector.
+ * @param extensionTabIdentifier An identifier for an extension tab created using WKInspectorExtension methods.
+ * @param completionHandler The completion handler to be called when the request to show the tab succeeds or fails.
+ * @discussion This method has no effect if the extensionTabIdentifier is invalid.
+ * It is an error to call this method prior to calling -[_WKInspectorIBActions show].
+ */
+- (void)showExtensionTabWithIdentifier:(NSString *)extensionTabIdentifier completionHandler:(void(^)(NSError * _Nullable))completionHandler;
+
+/**
+ * @abstract Loads the extension tab with a specified URL.
+ * @param extensionTabIdentifier An identifier for an extension tab created using WKInspectorExtension methods.
+ * @param url The URL that the should be loaded in the extension tab.
+ * @param completionHandler The completion handler to be called when the load succeeds or fails.
+ * @discussion This method has no effect if the extensionTabIdentifier is invalid.
+ * It is an error to call this method prior to calling -[_WKInspectorIBActions show].
+ */
+- (void)navigateExtensionTabWithIdentifier:(NSString *)extensionTabIdentifier toURL:(NSURL *)url completionHandler:(void(^)(NSError * _Nullable))completionHandler;
+
+/**
+ * @abstract The web view that is used to host extension tabs created via _WKInspectorExtension.
+ * @discussion Browsing contexts for extension tabs are loaded in subframes of this web view.
+ */
+@property (nonatomic, nullable, readonly) WKWebView *extensionHostWebView;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/modules/WebKitPrivates/_WKInspectorIBActions.h b/modules/WebKitPrivates/_WKInspectorIBActions.h
new file mode 100644
index 0000000..cdcbe61
--- /dev/null
+++ b/modules/WebKitPrivates/_WKInspectorIBActions.h
@@ -0,0 +1,58 @@
+/*
+ * https://github.com/WebKit/WebKit/blob/main/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorIBActions.h
+ *
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol _WKInspectorIBActions <NSObject>
+
+/**
+ * @abstract Shows the associated Web Inspector instance.
+ */
+- (void)show;
+
+/**
+ * @abstract Closes the associated Web Inspector instance. This will cause all
+ * registered _WKInspectorExtensions to be unregistered and invalidated.
+ */
+- (void)close;
+
+/**
+ * @abstract Opens the Console Tab in the associated Web Inspector instance.
+ */
+- (void)showConsole;
+
+/**
+ * @abstract Opens the Sources Tab in the associated Web Inspector instance.
+ */
+- (void)showResources;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/sites/Facebook/app.js b/sites/Facebook/app.js
index ba7fb5c..ebde8b0 100644
--- a/sites/Facebook/app.js
+++ b/sites/Facebook/app.js
@@ -26,7 +26,7 @@ $.browser.addShortcut('Dark Mode', [], enDarken);
 
 function search(query) {
 	$.browser.tabSelected = fbTab;
-	//fbTab.loadURL("https://m.facebook.com/graphsearch/str/" + query + "/keywords_top?ref=content_filter&source=typeahead")
+	//fbTab.load_url("https://m.facebook.com/graphsearch/str/" + query + "/keywords_top?ref=content_filter&source=typeahead")
 	fbTab.evalJS(
 		'document.querySelector("#search_jewel > a").click();' +
 		'document.getElementById("main-search-input").value = "'+query+'";' +
diff --git a/sites/Google_Photos/app.js b/sites/Google_Photos/app.js
index 4b53838..be00e66 100644
--- a/sites/Google_Photos/app.js
+++ b/sites/Google_Photos/app.js
@@ -10,7 +10,7 @@ $.browser.tabSelected = photosTab = new $.WebView(photos);
 var delegate = {}; // our delegate to receive events from the webview app
 
 function search(query) {
-	photosTab.loadURL("https://photos.google.com/search/"+query); // FIXME: do this in JS
+	photosTab.load_url("https://photos.google.com/search/"+query); // FIXME: do this in JS
 }
 
 delegate.launchURL = function(url) {
diff --git a/sites/Google_Voice/automators.js b/sites/Google_Voice/automators.js
new file mode 100644
index 0000000..04b0f5f
--- /dev/null
+++ b/sites/Google_Voice/automators.js
@@ -0,0 +1,64 @@
+/*
+ * injected funcs for doing stuff with the googlePhone
+ *
+ *  take a look at https://github.com/jerrod-lankford/google-voice-desktop-app for more possibilities
+ *  (SMS send/recv)
+ * _gv.soyProto has some interseting stuff in it, like .VoiceClientAccount (current phone number)
+ */
+
+	function getCallBox() { return document.getElementsByTagName('gv-make-call-panel')[0].getElementsByTagName('input')[0]; }
+
+	function inputAddress(addr, endkeys) {
+		if (addr == null || addr == '') return;
+		addr = decodeURI(addr);
+		var cb = window.getCallBox();
+		cb.blur();
+		cb.value = '';
+		cb.focus();
+		//cb.value = addr;
+		var tev = document.createEvent("TextEvent");
+		tev.initTextEvent('textInput', true, true, null, addr);
+		cb.dispatchEvent(tev);
+		if (endkeys != null) // Enter will open a direct call
+			sendkeys(cb, endkeys);
+	};
+
+	function sendkeys(el, keys) {
+		//for (var i = 1; i < arguments.length; i++) {
+			//var key = arguments[i];
+		var keyids = { // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.keyCode
+			8: 'backspace',
+			9: 'tab',
+			//10: 'newline',
+			13: 'enter',
+			27: 'esc',
+			32: 'space',
+			38: 'up',
+			40: 'down',
+			46: 'Period', //wtf webkit?!
+			108: '.'
+		};
+		for (key of keys) {
+			var keycode = (Number(key)) ? key : key.charCodeAt(0); // String.fromCharCode(keycode)
+			var keyid = keyids[keycode];
+			for (kt of ["keydown", "keypress", "keyup"]) {
+				var kev = new KeyboardEvent(kt, { bubbles: true, cancelable: true, view: window, detail: 0, keyIdentifier: keyid, location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD, ctrlKey: false, altKey: false, shiftKey: false, metaKey: false }); //key: keycode
+				if (kt == 'keypress') {
+					Object.defineProperty(kev, 'charCode', {'value': keycode, 'enumerable': true});
+				} else {
+					Object.defineProperty(kev, 'charCode', {'value': 0, 'enumerable': true});
+				}
+				// .which??
+				Object.defineProperty(kev, 'keyCode', {'value': keycode, 'enumerable': true});
+
+				setTimeout(function(){ el.dispatchEvent(kev); }, 10000); //add a bit of lag
+			}
+		}
+		if (typeof el.value == 'string') el.value += key;
+	};
+
+	function makeCall() { setTimeout(function(){
+		var tgt = document.querySelector("button[gv-test-id='new-call-button']");
+		tgt.click();
+		return;
+	}, 1000); } //wait for contact to get found
diff --git a/sites/Google_Voice/icon.png b/sites/Google_Voice/icon.png
index 7fd49ab..090797f 100644
Binary files a/sites/Google_Voice/icon.png and b/sites/Google_Voice/icon.png differ
diff --git a/sites/Google_Voice/main.js b/sites/Google_Voice/main.js
index fee7e9e..8249f95 100644
--- a/sites/Google_Voice/main.js
+++ b/sites/Google_Voice/main.js
@@ -6,75 +6,20 @@
 const {app, BrowserWindow, WebView} = require('@MacPin');
 let browser = new BrowserWindow();
 
-const mozUA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:68.0) Gecko/20100101 Firefox/68.0'
-const mozApp = 'Gecko/20100101 Firefox/68.0'
-//    https://blog.mozilla.org/webrtc/firefox-is-now-supported-by-google-hangouts-and-meet/ should we pretend to be FireFox 60?
-// https://bloggeek.me/webrtc-adapter-js/ https://github.com/webrtc/adapter
-//  https://webkit.org/blog/7763/a-closer-look-into-webrtc/
-const mozariUA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) Gecko/20100101 Firefox/68.0 (KHTML, like Gecko) Version/13.0 Safari/605.1.15'
-// google is looking for AppleWebKit, jsSip is looking for Safari
-
-// (app.libraries['com.apple.WebKit'].CFBundleShortVersionString.startsWith('136') || 
-let useChromeAV, useFirefoxAV;
-useChromeAV = (!app.pathExists('/Library/Internet Plug-Ins/googletalkbrowserplugin.plugin') && app.doesAppExist("com.google.Chrome"))
-useFirefoxAV = (!app.pathExists('/Library/Internet Plug-Ins/googletalkbrowserplugin.plugin') && app.doesAppExist("org.mozilla.firefox"))
-
-const meet = { url: "https://meet.google.com", agent: mozariUA };
-const allo = { url: "https://g.co/alloforweb", agent: mozariUA };
-// https://www.androidpolice.com/2017/10/03/allo-web-adds-support-firefox-opera-ios/
-
-// https://support.google.com/meet/answer/7353922?hl=en
-// ^ HTML5 notifications should work now
-// but they dont in classic hangouts???
-// https://github.com/NicoSantangelo/hangouts-chrome-notifications/blob/master/content.js would need to wrap chrome.extension & chrome.runtime
-
 const voice = {
 	url: "https://voice.google.com",
-	//agent: mozariUA
+	postinject: ["automators"]
 };
-// window.JsSip. window._gv
-// wss://web.voice.telephony.goog/websocket doesn't work because Goog dgaf about standards
-//   https://support.google.com/voice/thread/14998073?msgid=14998073
-//   https://bugs.webkit.org/show_bug.cgi?id=202095
-//
-//   July 2021 update!
-//       I get two-way audio when using ether firefox "mozari" UA or standard Safari UA in macOS11.5 "big sur".
-//       It appears they learned how to send a proper status line for their websockets:
-//       $ curl -si 'https://web.voice.telephony.goog/websocket' -H 'Host: web.voice.telephony.goog' -H 'Upgrade: websocket' -H 'Connection: Upgrade' -H "Sec-WebSocket-Key: $(openssl rand -base64 16)" -H 'Origin: https://voice.google.com' -H 'Sec-WebSocket-Protocol: sip' -H 'Sec-WebSocket-Version: 13' | head -n1
-//         > HTTP/1.1 101 Switching Protocols
-//
-//  voiceTab.evalJS(`JsSIP.debug.enable('JsSIP:*');`);
-
-// http://voice.google.com/messages
-// will get in-page RTC calling: https://productforums.google.com/forum/#!topic/voice/aI7m1PrV21Y;context-place=topicsearchin/voice/notifications
-let voiceTab = new WebView(voice); // start loading right way, its a big Closure app
-
-/*
- https://support.google.com/voice/answer/168521?hl=en&co=GENIE.Platform%3DDesktop
-
-_gv.Tsa == window.angular.module("voice.service.NotificationSenderModule") // "true"
-`new window.Notification` has a hit in the main minified @
-	https://www.gstatic.com/_/voice/_/js/k=voice.voice_module_set.en_US.LRmWe0b1qLs.O/am=AAE/rt=j/d=1/rs=AJAOlGkr58y4dSXuNrjlUOOThgCPvCXA3w/m=base
-tag starts with 'gv:'
-
-*/
+let voiceTab = new WebView(voice); // start loading right away, it's a big app
 
 function unhideApp(tab) {
 	if (tab) browser.tabSelected = tab;
 	browser.unhideApp();
 };
 
-// there is also SIP support for GV accounts via asterisk: https://github.com/naf419/asterisk/tree/gvsip
-
-const enDarken = require('enDarken.js');
-
 const setAgent = function(agent, tab) { tab.userAgent = agent; };
 // looks like a reload has to be done for this to take full effect.
 
-// https://github.com/google/google-api-javascript-client/issues/397
-// ^^ see that error all the time when attempting to make calls
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src
-
 app.on("decideNavigationForClickedURL", function(url, tab, mainFrame) {
 	if (
 		!url.startsWith("https://talkgadget.google.com")
@@ -105,25 +50,6 @@ app.on("decideNavigationForClickedURL", function(url, tab, mainFrame) {
 //app.on('decideNavigationForMIME', function() { return false; });
 
 app.on('decideWindowOpenForURL', function(url, tab) {
-	// if tab==hangoutsTab || tab==voiceTab
-	if (url.startsWith("https://plus.google.com/hangouts/_/")) { //G+ hangouts a/v chat
-		if (useFirefoxAV) {
-			console.log("firefoxing!")
-			app.openURL(url, "org.mozilla.firefox");
-			return true;
-		} else if (useChromeAV) {
-			app.openURL(url, "com.google.Chrome");
-			return true;
-		}
-	}
-
-	/*
-	if (url.startsWith("//talkgadget.google.com/u/0/talkgadget/_/frame")) { // hangouts "pop-out"
-		browser.tabSelected = new WebView({url: url}); // chat pop-out should change tab to new chat tab, and not change size
-		return true; //doesn't work because parent webViewConfig is not passed through
-	}
-	*/
-
 	return false; // proceed to .didWindowOpenForURL
 });
 
@@ -133,14 +59,6 @@ app.on('didWindowOpenForURL', function(url, newTab, tab) {
 	if (url.length > 0 && newTab)
 		console.log(`window.open(${url})`);
 
-	if (tab==voiceTab && url.startsWith("https://plus.google.com/hangouts/_/")) { //G+ hangouts a/v chat
-		//newTab.userAgent = mozUA; // will force use of WebRTC instead of vidyo plugin
-		newTab.allowsRecording = true;
-		newTab.loadURL(url);
-		browser.tabSelected = newTab; // take focus
-		return true; // macpin will return the newTab to tab's JS
-	}
-
 	return false; // macpin will popup(newTab, url) and return newTab to tab's JS
 });
 
@@ -153,7 +71,6 @@ app.on('didWindowClose', function(tab) {
 
 app.on('handleUserInputtedInvalidURL', function(query, tab) {
 	if (tab == voiceTab && Number(query)) { // wut about "(555) 867-5309"
-		//hangoutsTab.evalJS(`xssRoster(['inputAddress', '${query}']);`);
 		delegate.launchURL(`tel:${query}`);
 		return true; // tell MacPin to stop validating the URL
 	}
@@ -167,29 +84,16 @@ app.on('launchURL', function(url) { // app.openURL(/[sms|hangouts|tel]:.*/) call
 		addr = comps.shift().replace(/\//g, ''); // de-slashed
 	switch (scheme) {
 		case 'tel':
-			// TODO: interpret commas as 2-sec delays and pounds as pounds
-			if (app.libraries['com.apple.WebKit'].CFBundleShortVersionString.startsWith('9136') || app.pathExists('/Library/Internet Plug-Ins/googletalkbrowserplugin.plugin')) {
-				// have either WebRTC'd WebKit on High Sierra or can use NPAPI GoogleVoice & Video (Vidyo) plugin in the WebView
-				// window.a also seems to have a list of loaded plugins
-				unhideApp(); //user might have switched apps while waiting for roster to load
-				browser.tabSelected = voiceTab;
-				voiceTab.evalJS(`
-					window.open("https://plus.google.com/hangouts/_/?hl=en&hpn=${addr}&hip=${addr}&hnc=0");
-				`);
-			} else if (app.doesAppExist("org.mozilla.firefox")) {
-				// use Chrome's NaCL+WebRTC Hangouts client for A/V chats ( https://webrtchacks.com/hangout-analysis-philipp-hancke/ )
-				app.openURL("https://plus.google.com/hangouts/_/?hl=en&hpn="+addr+"&hip="+addr+"&hnc=0", "org.mozilla.firefox");
-			} else if (app.doesAppExist("com.google.Chrome")) {
-				// use Chrome's NaCL+WebRTC Hangouts client for A/V chats ( https://webrtchacks.com/hangout-analysis-philipp-hancke/ )
-				app.openURL("https://plus.google.com/hangouts/_/?hl=en&hpn="+addr+"&hip="+addr+"&hnc=0", "com.google.Chrome");
-			} else {
-				// no plugin or chrome ...
-				browser.tabSelected = new WebView({url: "https://encrypted.google.com/tools/dlpage/hangoutplugin"}); //prompt to install plugin
-				app.openURL("tel:"+addr, "com.apple.facetime"); // maybe they have iPhone w/Handoff, so try call w/ facetime
-			}
+			unhideApp(); //user might have switched apps while waiting for roster to load
+			browser.tabSelected = voiceTab;
+			voiceTab.evalJS(`
+				inputAddress('${addr}');
+				makeCall();
+			`);
 			break;
+		case 'http':
 		case 'https':
-			if (!url.startsWith("//accounts.google.com")) { browser.tabSelected.loadURL(url); break; }
+			if (!url.startsWith("//accounts.google.com")) { browser.tabSelected.load_url(url); break; }
 		default:
 			app.openURL(url);
 	}
@@ -206,32 +110,17 @@ app.on('handleClickedNotification', (note) => {
 	return false;
 });
 
-
 app.on('AppWillFinishLaunching', (AppUI) => {
 	browser.addShortcut("Google Voice", voice);
 	browser.addShortcut("Log into Google Account", "https://accounts.google.com/signin");
-	browser.addShortcut("Install Google Voice & Video plugin", "https://encrypted.google.com/tools/dlpage/hangoutplugin");
-	//    `brew cask install google-hangouts`
-	//browser.addShortcut("Hangouts Meet", meet);
-	//browser.addShortcut("Allo for Web", allo);
-	browser.addShortcut('Dark Mode', [], enDarken);
-	//browser.addShortcut("Test call to MCI ANAC", "tel:18004444444");
-	browser.addShortcut('UA: Mac Firefox', [mozariUA], setAgent);
+	browser.addShortcut("Test call to MCI ANAC", "tel:18004444444");
 	browser.addShortcut('UA: default', [false], setAgent);
 
 	AppUI.browserController = browser; // make sure main app menu can get at our shortcuts
 	//browser.addShortcut('Enable Redirection to external domains', [true], toggleRedirection);
-	enDarken(voiceTab);
 	voiceTab.allowsRecording = true;
 });
 
-
 app.on('AppFinishedLaunching', function(launchURLs) {
-	//app.registerURLScheme('sms'); // `open -a Messages.app imessage:18004444444` still works
-	//app.registerURLScheme('tel'); // `open -a Facetime.app tel:18004444444` still works
-	//app.registerURLScheme('googlevoice');
-	// OSX Yosemite safari recognizes and launches sms and tel links to any associated app
-	// https://github.com/WebKit/webkit/blob/ce77bdb93dbd24df1af5d44a475fe29b5816f8f9/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm#L691
-	// https://developer.apple.com/library/ios/featuredarticles/iPhoneURLScheme_Reference/Introduction/Introduction.html#//apple_ref/doc/uid/TP40007899
 	browser.tabSelected = voiceTab;
 });
diff --git a/sites/Hangouts/app.js b/sites/Hangouts/app.js
index ce58f64..ecc8b3b 100644
--- a/sites/Hangouts/app.js
+++ b/sites/Hangouts/app.js
@@ -114,7 +114,7 @@ delegate.launchURL = function(url) { // $.app.openURL(/[sms|hangouts|tel]:.*/) c
 			}
 			break;
 		case 'https':
-			if (!url.startsWith("//accounts.google.com")) { $.browser.tabSelected.loadURL(url); break; }
+			if (!url.startsWith("//accounts.google.com")) { $.browser.tabSelected.load_url(url); break; }
 		default:
 			$.app.openURL(url);
 	}
diff --git a/sites/MacPin/main.js b/sites/MacPin/main.js
index a6ea87c..579fdc9 100644
--- a/sites/MacPin/main.js
+++ b/sites/MacPin/main.js
@@ -18,10 +18,10 @@ var docTab = new WebView({
 	caching: false,
 	url: "file:///usr/share/doc/cups/index.html",
 	useSystemAppearance: true,
-	inspectorVisible: true
+	//inspectorVisible: true // works but is floating window, annoying
 });
 var gitTab = new WebView('https://github.com/kfix/MacPin');
-//var gooTab = new WebView({url: "http://google.com"})
+var wkbTab = new WebView({url: "https://webkit.org/blog"})
 
 let browser = new BrowserWindow();
 
@@ -126,7 +126,7 @@ app.on('decideNavigationForMIME', (mime, url, webview) => {
 		case 'application/x-mpegurl':
 		case 'application/vnd.apple.mpegurl':
 			// FIXME: ensure url is for main frame
-			webview.loadURL('file://' + app.resourcePath + '/media_player.html?src=' + encodeURIComponent(url)); // FIXME: urldecode(url)
+			webview.load_url('file://' + app.resourcePath + '/media_player.html?src=' + encodeURIComponent(url)); // FIXME: urldecode(url)
 			return true;
 		default:
 			break;
@@ -323,7 +323,6 @@ app.on('AppWillFinishLaunching', (AppUI) => {
 	browser.addShortcut('MacPin Playground', [true], launchRepl);
 
 	if (app.platform === "OSX") app.changeAppIcon('icon.png');
-	//browser.tabSelected = new $.WebView({url: 'http://github.com/kfix/MacPin'});
 
 	AppUI.browserController = browser; // make sure main app menu can get at our shortcuts
 	console.log(app.browserController);
@@ -333,6 +332,7 @@ app.on('AppWillFinishLaunching', (AppUI) => {
 
 	// shuffle the _tabs using the tabs Proxy
 	browser.tabs.push(gitTab);
+	browser.tabs.push(wkbTab);
 	browser.tabs.push(docTab);
 	browser.tabs.reverse(); // selection will change to the pushed tab that was flipped #0
 
diff --git a/sites/Slack/main.js b/sites/Slack/main.js
index 476db8f..b9acbed 100644
--- a/sites/Slack/main.js
+++ b/sites/Slack/main.js
@@ -33,7 +33,7 @@ app.on('networkIsOffline', (url, tab) => {
 	// Slack.app might be set to start at boot but wifi lags behind
 	// so this is crazy, but here's my number, so call me maybe?
 	console.log("reloading from offline!");
-	slackTab.loadURL(slack.url);
+	slackTab.load_url(slack.url);
 });
 
 app.on('receivedRedirectionToURL', (url, tab) => {
@@ -86,7 +86,7 @@ let clicker = (url, tab, mainFrame) => {
 				tab.url.endsWith("slack.com/get-started#/createnew")
 			) {
 				console.log(`${url} clicked from the profile picker, absorbing popup`);
-				tab.loadURL(url);
+				tab.load_url(url);
 				return true;
 			}
 			if (alwaysAllowRedir) break; //user override
@@ -159,7 +159,7 @@ app.on('didWindowOpenForURL', function(url, newTab, tab) {
 		console.log(`window.open(${url})`);
 
 	if (tab==slackTab) {
-		newTab.loadURL(url);
+		newTab.load_url(url);
 		browser.tabSelected = newTab; // take focus
 		return true; // macpin will return the newTab to tab's JS
 	}