diff --git a/.gitignore b/.gitignore
index 7a83009a..962a80e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@ Carthage
 
 # Swift Package Manager
 .build/
+.swiftpm
 
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
new file mode 100644
index 00000000..f0d670b4
--- /dev/null
+++ b/Package@swift-5.10.swift
@@ -0,0 +1,123 @@
+// swift-tools-version:5.10
+
+import PackageDescription
+
+let package = Package(
+    name: "Highlightr",
+    platforms: [
+      .macOS(.v10_15), .iOS(.v13), .visionOS(.v1), .watchOS(.v7), .tvOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "Highlightr",
+            targets: ["Highlightr"]
+        ),
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "Highlightr",
+            dependencies: [],
+            path: "Pod",
+            exclude: [
+                "Assets/Highlighter/LICENSE",
+            ],
+            sources: [
+                "Classes",
+            ],
+            resources: [
+                .copy("Assets/Highlighter/highlight.min.js"),
+                .copy("Assets/styles/a11y-dark.min.css"),
+                .copy("Assets/styles/a11y-light.min.css"),
+                .copy("Assets/styles/agate.min.css"),
+                .copy("Assets/styles/an-old-hope.min.css"),
+                .copy("Assets/styles/androidstudio.min.css"),
+                .copy("Assets/styles/arduino-light.min.css"),
+                .copy("Assets/styles/arta.min.css"),
+                .copy("Assets/styles/ascetic.min.css"),
+                .copy("Assets/styles/atelier-cave-dark.min.css"),
+                .copy("Assets/styles/atelier-cave-light.min.css"),
+                .copy("Assets/styles/atelier-dune-dark.min.css"),
+                .copy("Assets/styles/atelier-dune-light.min.css"),
+                .copy("Assets/styles/atelier-estuary-dark.min.css"),
+                .copy("Assets/styles/atelier-estuary-light.min.css"),
+                .copy("Assets/styles/atelier-forest-dark.min.css"),
+                .copy("Assets/styles/atelier-forest-light.min.css"),
+                .copy("Assets/styles/atelier-heath-dark.min.css"),
+                .copy("Assets/styles/atelier-heath-light.min.css"),
+                .copy("Assets/styles/atelier-lakeside-dark.min.css"),
+                .copy("Assets/styles/atelier-lakeside-light.min.css"),
+                .copy("Assets/styles/atelier-plateau-dark.min.css"),
+                .copy("Assets/styles/atelier-plateau-light.min.css"),
+                .copy("Assets/styles/atelier-savanna-dark.min.css"),
+                .copy("Assets/styles/atelier-savanna-light.min.css"),
+                .copy("Assets/styles/atelier-seaside-dark.min.css"),
+                .copy("Assets/styles/atelier-seaside-light.min.css"),
+                .copy("Assets/styles/atelier-sulphurpool-dark.min.css"),
+                .copy("Assets/styles/atelier-sulphurpool-light.min.css"),
+                .copy("Assets/styles/atom-one-dark-reasonable.min.css"),
+                .copy("Assets/styles/atom-one-dark.min.css"),
+                .copy("Assets/styles/atom-one-light.min.css"),
+                .copy("Assets/styles/brown-paper.min.css"),
+                .copy("Assets/styles/codepen-embed.min.css"),
+                .copy("Assets/styles/color-brewer.min.css"),
+                .copy("Assets/styles/darcula.min.css"),
+                .copy("Assets/styles/dark.min.css"),
+                .copy("Assets/styles/darkula.min.css"),
+                .copy("Assets/styles/default.min.css"),
+                .copy("Assets/styles/docco.min.css"),
+                .copy("Assets/styles/dracula.min.css"),
+                .copy("Assets/styles/far.min.css"),
+                .copy("Assets/styles/foundation.min.css"),
+                .copy("Assets/styles/github-gist.min.css"),
+                .copy("Assets/styles/github.min.css"),
+                .copy("Assets/styles/gml.min.css"),
+                .copy("Assets/styles/googlecode.min.css"),
+                .copy("Assets/styles/grayscale.min.css"),
+                .copy("Assets/styles/gruvbox-dark.min.css"),
+                .copy("Assets/styles/gruvbox-light.min.css"),
+                .copy("Assets/styles/hopscotch.min.css"),
+                .copy("Assets/styles/hybrid.min.css"),
+                .copy("Assets/styles/idea.min.css"),
+                .copy("Assets/styles/ir-black.min.css"),
+                .copy("Assets/styles/isbl-editor-dark.min.css"),
+                .copy("Assets/styles/isbl-editor-light.min.css"),
+                .copy("Assets/styles/kimbie.dark.min.css"),
+                .copy("Assets/styles/kimbie.light.min.css"),
+                .copy("Assets/styles/lightfair.min.css"),
+                .copy("Assets/styles/magula.min.css"),
+                .copy("Assets/styles/mono-blue.min.css"),
+                .copy("Assets/styles/monokai-sublime.min.css"),
+                .copy("Assets/styles/monokai.min.css"),
+                .copy("Assets/styles/nord.min.css"),
+                .copy("Assets/styles/obsidian.min.css"),
+                .copy("Assets/styles/ocean.min.css"),
+                .copy("Assets/styles/paraiso-dark.min.css"),
+                .copy("Assets/styles/paraiso-light.min.css"),
+                .copy("Assets/styles/pojoaque.min.css"),
+                .copy("Assets/styles/purebasic.min.css"),
+                .copy("Assets/styles/qtcreator_dark.min.css"),
+                .copy("Assets/styles/qtcreator_light.min.css"),
+                .copy("Assets/styles/railscasts.min.css"),
+                .copy("Assets/styles/rainbow.min.css"),
+                .copy("Assets/styles/routeros.min.css"),
+                .copy("Assets/styles/school-book.min.css"),
+                .copy("Assets/styles/shades-of-purple.min.css"),
+                .copy("Assets/styles/solarized-dark.min.css"),
+                .copy("Assets/styles/solarized-light.min.css"),
+                .copy("Assets/styles/sunburst.min.css"),
+                .copy("Assets/styles/tomorrow-night-blue.min.css"),
+                .copy("Assets/styles/tomorrow-night-bright.min.css"),
+                .copy("Assets/styles/tomorrow-night-eighties.min.css"),
+                .copy("Assets/styles/tomorrow-night.min.css"),
+                .copy("Assets/styles/tomorrow.min.css"),
+                .copy("Assets/styles/vs.min.css"),
+                .copy("Assets/styles/vs2015.min.css"),
+                .copy("Assets/styles/xcode.min.css"),
+                .copy("Assets/styles/xcode-dark.min.css"),
+                .copy("Assets/styles/xt256.min.css"),
+                .copy("Assets/styles/zenburn.min.css"),
+            ]
+        ),
+    ]
+)
diff --git a/Pod/Classes/CodeAttributedString.swift b/Pod/Classes/CodeAttributedString.swift
index 2c46b295..1d55b1db 100644
--- a/Pod/Classes/CodeAttributedString.swift
+++ b/Pod/Classes/CodeAttributedString.swift
@@ -10,7 +10,7 @@ import Foundation
 
 #if os(OSX)
     import AppKit
-#elseif os(iOS)
+#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
     import UIKit
 #endif
 
diff --git a/Pod/Classes/Shims.swift b/Pod/Classes/Shims.swift
index 965b341c..27bd89f2 100644
--- a/Pod/Classes/Shims.swift
+++ b/Pod/Classes/Shims.swift
@@ -10,7 +10,7 @@ import Foundation
 
 #if os(OSX)
     import AppKit
-#elseif os(iOS)
+#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
     import UIKit
 #endif
 
@@ -20,7 +20,7 @@ import Foundation
     public typealias AttributedStringKey = NSAttributedStringKey
 #endif
 
-#if swift(>=4.2) && os(iOS)
+#if swift(>=4.2) && (os(iOS) || os(tvOS) || os(watchOS) || os(visionOS))
     public typealias TextStorageEditActions = NSTextStorage.EditActions
 #else
     public typealias TextStorageEditActions = NSTextStorageEditActions
diff --git a/Pod/Classes/Theme.swift b/Pod/Classes/Theme.swift
index 9668e474..196c0e5a 100644
--- a/Pod/Classes/Theme.swift
+++ b/Pod/Classes/Theme.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
     import UIKit
     /// Typealias for UIColor
     public typealias RPColor = UIColor
@@ -90,7 +90,7 @@ open class Theme {
     {
         codeFont = font
         
-        #if os(iOS) || os(tvOS)
+        #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
         let boldDescriptor = UIFontDescriptor(fontAttributes: [UIFontDescriptor.AttributeName.family:font.familyName,
                                                                 UIFontDescriptor.AttributeName.face:"Bold"])
         let italicDescriptor = UIFontDescriptor(fontAttributes: [UIFontDescriptor.AttributeName.family:font.familyName,