diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift b/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
index 4f4a8b34..c6a14872 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift
@@ -21,7 +21,7 @@ import VDSColorTokens
         else { return }
         
         // Set line to the same color as the text
-        if let color = titleLabel?.textColor?.cgColor {
+        if let color = titleColor(for: state)?.cgColor {
             context.setStrokeColor(color)
         }
         
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.h b/MVMCoreUI/Categories/UIColor+MFConvenience.h
index 97280ba1..10e9433d 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.h
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.h
@@ -183,8 +183,12 @@
 // Returns a gradient lighter color;
 + (nonnull UIColor *)mfGradientColor:(nullable UIColor *)color;
 
+// Returns if the color is dark or not
+- (BOOL)isDark;
+
 #pragma mark - Hex String
 
 + (nullable NSString *)hexStringForColor:(nonnull UIColor*)color;
 + (nonnull UIColor *)mfGetColorForHexWithTransparency:(nonnull NSString *)hexString;
+
 @end
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index 8786df01..cd809509 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -389,6 +389,12 @@
     return [UIColor whiteColor];
 }
 
+- (BOOL)isDark {
+    CGFloat greyScale = 0;
+    [self getWhite:&greyScale alpha:nil];
+    return greyScale < 0.5;
+}
+
 #pragma mark - Hex String
 
 + (nullable NSString *)hexStringForColor:(nonnull UIColor*)color {
diff --git a/MVMCoreUI/Containers/NavigationController/UINavigationController+Extension.swift b/MVMCoreUI/Containers/NavigationController/UINavigationController+Extension.swift
index 625f0a25..3372c1ab 100644
--- a/MVMCoreUI/Containers/NavigationController/UINavigationController+Extension.swift
+++ b/MVMCoreUI/Containers/NavigationController/UINavigationController+Extension.swift
@@ -12,6 +12,7 @@ import MVMCore
 public extension UINavigationController {
     
     /// Convenience function for setting the navigation item.
+    @MainActor
     func setNavigationItem(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) {
         
         let behaviorHandler = pageBehaviorController ?? viewController as? PageBehaviorHandlerProtocol;
@@ -33,6 +34,7 @@ public extension UINavigationController {
     }
     
     /// Convenience function for setting the navigation buttons.
+    @MainActor
     func setNavigationButtons(with model: NavigationItemModelProtocol, for viewController: UIViewController) {
         let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
         var leftItems: [UIBarButtonItem] = []
@@ -60,6 +62,7 @@ public extension UINavigationController {
     }
     
     /// Convenience function for setting the navigation titleView.
+    @MainActor
     func setNavigationTitleView(with model: NavigationItemModelProtocol, for viewController: UIViewController, coordinatingWith pageBehaviorController: PageBehaviorHandlerProtocol? = nil) {
         guard let titleViewModel = model.titleView else { return }
         
@@ -87,6 +90,7 @@ public extension UINavigationController {
     }
     
     /// Convenience function for setting the navigation bar ui
+    @MainActor
     func setNavigationBarUI(with model: NavigationItemModelProtocol) {
         let navigationBar = navigationBar
         let font = Styler.Font.BoldTitleSmall.getFont(false)