diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 128bc3d..715c43a 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -43,6 +43,8 @@
 		EA0D1C312A673F3500E5C127 /* RadioButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */; };
 		EA0D1C332A673FD400E5C127 /* RadioButtonItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */; };
 		EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */; };
+		EA21C5D82B600E4200CFC139 /* VDSTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; };
+		EA21C5D92B600E4200CFC139 /* VDSTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA297A682A02F5320031ED56 /* TableViewTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA297A672A02F5320031ED56 /* TableViewTestController.swift */; };
 		EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; };
 		EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */; };
@@ -95,12 +97,6 @@
 		EAF7F0CC289DA24F00B287F5 /* DownloadArtifactoryItems.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */; };
 		EAF7F0CD289DA24F00B287F5 /* Artifactory.sh in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */; };
 		EAF7F11A28A14A0E00B287F5 /* RadioButtonGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */; };
-		EAF7F11B28A1585000B287F5 /* VDSTypographyTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */; };
-		EAF7F11C28A1585000B287F5 /* VDSTypographyTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		EAF7F11D28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */; };
-		EAF7F11E28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		EAF7F12328A1585000B287F5 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */; };
-		EAF7F12428A1585000B287F5 /* VDSColorTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -110,10 +106,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				EAF7F11E28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Embed Frameworks */,
-				EAF7F12428A1585000B287F5 /* VDSColorTokens.xcframework in Embed Frameworks */,
 				EA978EC3291AC62200ACC883 /* VDS.framework in Embed Frameworks */,
-				EAF7F11C28A1585000B287F5 /* VDSTypographyTokens.xcframework in Embed Frameworks */,
+				EA21C5D92B600E4200CFC139 /* VDSTokens.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -142,6 +136,7 @@
 		EA0D1C302A673F3500E5C127 /* RadioButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonViewController.swift; sourceTree = "<group>"; };
 		EA0D1C322A673FD400E5C127 /* RadioButtonItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonItemViewController.swift; sourceTree = "<group>"; };
 		EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaretViewController.swift; sourceTree = "<group>"; };
+		EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTokens.xcframework; path = SharedFrameworks/VDSTokens.xcframework; sourceTree = "<group>"; };
 		EA297A672A02F5320031ED56 /* TableViewTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewTestController.swift; sourceTree = "<group>"; };
 		EA3C3B99289966EF000CA526 /* VDSSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VDSSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		EA3C3B9C289966EF000CA526 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -194,9 +189,6 @@
 		EAF7F0C5289DA24F00B287F5 /* ArtifactoryItems.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ArtifactoryItems.txt; sourceTree = "<group>"; };
 		EAF7F0C8289DA24F00B287F5 /* DownloadArtifactoryItems.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = DownloadArtifactoryItems.sh; sourceTree = "<group>"; };
 		EAF7F0C9289DA24F00B287F5 /* Artifactory.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Artifactory.sh; sourceTree = "<group>"; };
-		EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTypographyTokens.xcframework; path = SharedFrameworks/VDSTypographyTokens.xcframework; sourceTree = "<group>"; };
-		EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSFormControlsTokens.xcframework; path = SharedFrameworks/VDSFormControlsTokens.xcframework; sourceTree = "<group>"; };
-		EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = SharedFrameworks/VDSColorTokens.xcframework; sourceTree = "<group>"; };
 		EAF7F11928A14A0E00B287F5 /* RadioButtonGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioButtonGroupViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -205,10 +197,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EAF7F11D28A1585000B287F5 /* VDSFormControlsTokens.xcframework in Frameworks */,
-				EAF7F12328A1585000B287F5 /* VDSColorTokens.xcframework in Frameworks */,
 				EA978EC2291AC62200ACC883 /* VDS.framework in Frameworks */,
-				EAF7F11B28A1585000B287F5 /* VDSTypographyTokens.xcframework in Frameworks */,
+				EA21C5D82B600E4200CFC139 /* VDSTokens.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -250,10 +240,8 @@
 		EA3C3BB8289968A0000CA526 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				EA21C5D72B600E4200CFC139 /* VDSTokens.xcframework */,
 				EA978EC1291AC62200ACC883 /* VDS.framework */,
-				EAF7F0DC289DB0B400B287F5 /* VDSColorTokens.xcframework */,
-				EAF7F0DB289DB0B400B287F5 /* VDSFormControlsTokens.xcframework */,
-				EAF7F0DA289DB0B400B287F5 /* VDSTypographyTokens.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
diff --git a/VDSSample/Classes/TextField.swift b/VDSSample/Classes/TextField.swift
index 20c57b8..7672582 100644
--- a/VDSSample/Classes/TextField.swift
+++ b/VDSSample/Classes/TextField.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSFormControlsTokens
+import VDSTokens
 import Combine
 
 open class TextField: UITextField {
@@ -47,14 +47,14 @@ open class TextField: UITextField {
     
     public override func textRect(forBounds bounds: CGRect) -> CGRect {
         layer.borderColor = UIColor.black.cgColor
-        layer.borderWidth = VDSFormControls.widthBorder
+        layer.borderWidth = VDSFormControls.borderWidth
         let rect = super.textRect(forBounds: bounds)
         return rect.inset(by: textPadding)
     }
     
     public override func editingRect(forBounds bounds: CGRect) -> CGRect {
         layer.borderColor = UIColor.black.cgColor
-        layer.borderWidth = VDSFormControls.widthBorder
+        layer.borderWidth = VDSFormControls.borderWidth
         let rect = super.editingRect(forBounds: bounds)
         return rect.inset(by: textPadding)
     }
diff --git a/VDSSample/Supporting Files/Artifactory/ArtifactoryItems.txt b/VDSSample/Supporting Files/Artifactory/ArtifactoryItems.txt
index 770439a..68a3838 100644
--- a/VDSSample/Supporting Files/Artifactory/ArtifactoryItems.txt	
+++ b/VDSSample/Supporting Files/Artifactory/ArtifactoryItems.txt	
@@ -1,3 +1 @@
-${PROJECT_DIR}/SharedFrameworks/VDSTypographyTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTypographyTokens.2.0.0.xcframework.zip
-${PROJECT_DIR}/SharedFrameworks/VDSColorTokens.xcframework GVJV_VDS_Maven/%40vds-tokens/ios/VDSColorTokens.2.0.0.xcframework.zip
-${PROJECT_DIR}/SharedFrameworks/VDSFormControlsTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSFormControlsTokens.1.0.7.xcframework.zip
+${PROJECT_DIR}/SharedFrameworks/VDSTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTokens.2.0.0.xcframework.zip
diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 80ef4b7..f3e57f0 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index 3e37bd9..f02f916 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  BadgeViewController: BaseViewController<Badge> {
diff --git a/VDSSample/ViewControllers/BreadcrumbsViewController.swift b/VDSSample/ViewControllers/BreadcrumbsViewController.swift
index 88cc5fe..1cee787 100644
--- a/VDSSample/ViewControllers/BreadcrumbsViewController.swift
+++ b/VDSSample/ViewControllers/BreadcrumbsViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  BreadcrumbsViewController: BaseViewController<Breadcrumbs> {
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index ba3847d..f2c4f62 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class ButtonGroupViewController: BaseViewController<ButtonGroup> {
     var collectionView: UICollectionView!
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index d7246ac..5113cfc 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 import VDS
 import Combine
-import VDSColorTokens
+import VDSTokens
 
 class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 4939147..1415efb 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class ButtonViewController: BaseViewController<Button> {
     
diff --git a/VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift b/VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift
index 941172f..99ca1ce 100644
--- a/VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift
+++ b/VDSSample/ViewControllers/CarouselScrollbarViewConttroller.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 import VDS
 import Combine
-import VDSColorTokens
+import VDSTokens
 
 class CarouselScrollbarViewConttroller: BaseViewController<CarouselScrollbar> {
     
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index 4a95d7c..6c40880 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index a25c6f3..3043c93 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index f11f4c1..20d9a80 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  CheckboxViewController: BaseViewController<Checkbox> {
diff --git a/VDSSample/ViewControllers/DropShawdowViewController.swift b/VDSSample/ViewControllers/DropShawdowViewController.swift
index 77c79b5..ec8bfa7 100644
--- a/VDSSample/ViewControllers/DropShawdowViewController.swift
+++ b/VDSSample/ViewControllers/DropShawdowViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class DropShadowViewController: BaseViewController<ShadowView> {
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 692663c..c2d4433 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class IconViewController: BaseViewController<Icon> {
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 4101b7e..61d5350 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  InputFieldViewController: BaseViewController<InputField> {
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index b4ca6b3..4781739 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class LabelViewController: BaseViewController<Label> {
 
diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index 86484c6..c300171 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 struct MenuComponent {
     var title: String
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index 6fd3fbc..4f71d7e 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -157,3 +157,4 @@ extension NotificationViewController: ComponentSampleable {
         return ComponentSample(component: component)
     }
 }
+
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index 2f961ef..b4c38d7 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index ac2850e..e4cd793 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index e7620fd..9b7f7f0 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 55aa4ae..589c20c 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  RadioButtonViewController: BaseViewController<RadioButton> {
diff --git a/VDSSample/ViewControllers/TableViewTestController.swift b/VDSSample/ViewControllers/TableViewTestController.swift
index 236be47..b7b1ddd 100644
--- a/VDSSample/ViewControllers/TableViewTestController.swift
+++ b/VDSSample/ViewControllers/TableViewTestController.swift
@@ -7,7 +7,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 public typealias ComponentSampleView = UIView & Surfaceable
 
diff --git a/VDSSample/ViewControllers/TabsContainerViewController.swift b/VDSSample/ViewControllers/TabsContainerViewController.swift
index 4809da7..ead450b 100644
--- a/VDSSample/ViewControllers/TabsContainerViewController.swift
+++ b/VDSSample/ViewControllers/TabsContainerViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 import VDS
 import Combine
-import VDSColorTokens
+import VDSTokens
 
 
 
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index 080105c..65d0ccd 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 import VDS
 import Combine
-import VDSColorTokens
+import VDSTokens
 
 class TabsViewController: BaseViewController<Tabs> {
     
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index 0f8bf5f..9769795 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  TextAreaViewController: BaseViewController<TextArea> {
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 7a66988..7eeef44 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
     
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index 1cad2f2..4c10eac 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class TextLinkViewController: BaseViewController<TextLink> {
     
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index 7c1bb65..3e26150 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class TileContainerViewController: BaseViewController<TileContainer> {
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index db840e6..3543d31 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class TileletViewController: BaseViewController<Tilelet> {
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index ea0d7f5..9f70de3 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class TitleLockupViewController: BaseViewController<TitleLockup> {
 
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 4f0b8e3..7ebf1d7 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class ToggleViewController: BaseViewController<Toggle> {
     
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index c03a9cf..7bafa41 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 import Combine
 
 class  TooltipViewController: BaseViewController<Tooltip> {
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 096d40b..89abda9 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabel> {