diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index c99cd174..cfe08ede 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -226,9 +226,6 @@
 		94C2D9AB23872EB50006CF46 /* LabelAttributeActionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C2D9AA23872EB50006CF46 /* LabelAttributeActionModel.swift */; };
 		94C661D923CCF4B400D9FE5B /* LeftRightLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9402C34F23A2CEA3004B974C /* LeftRightLabelModel.swift */; };
 		94C661DA23CCF4FB00D9FE5B /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AA33B33239813C50067DD0F /* UIColor+Extension.swift */; };
-		94CA227C24058534002D6750 /* VerizonNHGeTX-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227824058533002D6750 /* VerizonNHGeTX-Bold.otf */; };
-		94CA227D24058534002D6750 /* VerizonNHGeDS-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */; };
-		94CA227E24058534002D6750 /* VerizonNHGeDS-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227A24058533002D6750 /* VerizonNHGeDS-Bold.otf */; };
 		94F6516D2437954100631BF9 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94F6516C2437954100631BF9 /* Tabs.swift */; };
 		AA07EA912510A442009A2AE3 /* StarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA07EA902510A442009A2AE3 /* StarModel.swift */; };
 		AA07EA932510A451009A2AE3 /* Star.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA07EA922510A451009A2AE3 /* Star.swift */; };
@@ -442,7 +439,6 @@
 		D28764AC245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764AB245898A400CB882D /* ThreeLayerFillMiddleTemplateModel.swift */; };
 		D28764F9245A327200CB882D /* TwoLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764F8245A327200CB882D /* TwoLinkView.swift */; };
 		D28764FB245A33A500CB882D /* TwoLinkViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28764FA245A33A500CB882D /* TwoLinkViewModel.swift */; };
-		D287651A245B338E00CB882D /* VerizonNHGeTX-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */; };
 		D28A837923C7D5BC00DFE4FC /* PageModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837823C7D5BC00DFE4FC /* PageModelProtocol.swift */; };
 		D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837A23C928DA00DFE4FC /* MoleculeListCellProtocol.swift */; };
 		D28A837D23CCA86A00DFE4FC /* TabsListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28A837C23CCA86A00DFE4FC /* TabsListItemModel.swift */; };
@@ -849,10 +845,6 @@
 		94C2D9A623872DA90006CF46 /* LabelAttributeColorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeColorModel.swift; sourceTree = "<group>"; };
 		94C2D9A823872E5E0006CF46 /* LabelAttributeImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeImageModel.swift; sourceTree = "<group>"; };
 		94C2D9AA23872EB50006CF46 /* LabelAttributeActionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelAttributeActionModel.swift; sourceTree = "<group>"; };
-		94CA227824058533002D6750 /* VerizonNHGeTX-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeTX-Bold.otf"; sourceTree = "<group>"; };
-		94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeDS-Regular.otf"; sourceTree = "<group>"; };
-		94CA227A24058533002D6750 /* VerizonNHGeDS-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeDS-Bold.otf"; sourceTree = "<group>"; };
-		94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "VerizonNHGeTX-Regular.otf"; sourceTree = "<group>"; };
 		94F6516C2437954100631BF9 /* Tabs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tabs.swift; sourceTree = "<group>"; };
 		AA07EA902510A442009A2AE3 /* StarModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarModel.swift; sourceTree = "<group>"; };
 		AA07EA922510A451009A2AE3 /* Star.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Star.swift; sourceTree = "<group>"; };
@@ -2442,10 +2434,6 @@
 		D29DF31521ECECC0003B2FB9 /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
-				94CA227A24058533002D6750 /* VerizonNHGeDS-Bold.otf */,
-				94CA227924058533002D6750 /* VerizonNHGeDS-Regular.otf */,
-				94CA227824058533002D6750 /* VerizonNHGeTX-Bold.otf */,
-				94CA227B24058533002D6750 /* VerizonNHGeTX-Regular.otf */,
 				D29DF31721ECECC0003B2FB9 /* OCRAExtended.ttf */,
 			);
 			path = Fonts;
@@ -2751,13 +2739,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				94CA227C24058534002D6750 /* VerizonNHGeTX-Bold.otf in Resources */,
 				D29DF32C21EE8736003B2FB9 /* Localizable.strings in Resources */,
 				0A6C1FC324927E2E00E64B52 /* colors.xcassets in Resources */,
-				94CA227D24058534002D6750 /* VerizonNHGeDS-Regular.otf in Resources */,
 				D29DF32E21EE8C3D003B2FB9 /* Media.xcassets in Resources */,
-				94CA227E24058534002D6750 /* VerizonNHGeDS-Bold.otf in Resources */,
-				D287651A245B338E00CB882D /* VerizonNHGeTX-Regular.otf in Resources */,
 				D29DF31B21ECECC0003B2FB9 /* OCRAExtended.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
index bbde1bf9..22f65ade 100644
--- a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
+++ b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
@@ -7,10 +7,12 @@
 //
 
 import MVMCore
+import VDS
 
 open class CoreUIModelMapping: ModelMapping {
     open override class func registerObjects() {
         super.registerObjects()
+        Font.register()
         registerMolecules()
         registerRules()
         registerActions()
diff --git a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Bold.otf b/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Bold.otf
deleted file mode 100755
index dd3476af..00000000
Binary files a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Bold.otf and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Regular.otf b/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Regular.otf
deleted file mode 100755
index ce34c596..00000000
Binary files a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeDS-Regular.otf and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Bold.otf b/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Bold.otf
deleted file mode 100755
index 59b1f438..00000000
Binary files a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Bold.otf and /dev/null differ
diff --git a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Regular.otf b/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Regular.otf
deleted file mode 100755
index 13d202d1..00000000
Binary files a/MVMCoreUI/SupportingFiles/Fonts/VerizonNHGeTX-Regular.otf and /dev/null differ
diff --git a/MVMCoreUI/Utility/MFFonts.m b/MVMCoreUI/Utility/MFFonts.m
index 30ee68f0..10b0e8bc 100644
--- a/MVMCoreUI/Utility/MFFonts.m
+++ b/MVMCoreUI/Utility/MFFonts.m
@@ -25,10 +25,6 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
 + (void)loadMVMFonts {
     static dispatch_once_t once;
     dispatch_once(&once, ^{
-        [MFFonts loadFont:DSBold type:@"otf"];
-        [MFFonts loadFont:DSRegular type:@"otf"];
-        [MFFonts loadFont:TXBold type:@"otf"];
-        [MFFonts loadFont:TXRegular type:@"otf"];
         [MFFonts loadFont:@"OCRAExtended" type:@"ttf"];
     });
 }