diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h
index 64e406e7..488a0648 100644
--- a/MVMCoreUI/Styles/MFStyler.h
+++ b/MVMCoreUI/Styles/MFStyler.h
@@ -242,16 +242,15 @@ B3 -> Legal
 #pragma mark - Attributed Strings
 
 + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color;
-+ (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string;
-+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string;
++ (nonnull NSAttributedString *)styleGetH1AttributedString:(nullable NSString *)string;
++ (nonnull NSAttributedString *)styleGetH2AttributedString:(nullable NSString *)string;
++ (nonnull NSAttributedString *)styleGetH3AttributedString:(nullable NSString *)string;
 + (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string;
 + (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string;
 + (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string;
 
-+ (nonnull NSAttributedString *)styleGetDisabledBodyAttributedString:(nullable NSString *)string;
-
-+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string;
-+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(nullable NSString *)string;
++ (nonnull NSAttributedString *)styleGetDisabledB2AttributedString:(nullable NSString *)string;
++ (nonnull NSAttributedString *)styleGetDisabledB1AttributedString:(nullable NSString *)string;
 + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftString:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color;
 + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftStringRightTop:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color;
 + (void)styleGetAlignCenteredAttrituedString:(nullable NSMutableAttributedString *)string;
diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m
index fc9b0c6c..36d04e51 100644
--- a/MVMCoreUI/Styles/MFStyler.m
+++ b/MVMCoreUI/Styles/MFStyler.m
@@ -613,38 +613,38 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
     return attributedString;
 }
 
-+ (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string {
-    return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor mfRedColor]];
++ (nonnull NSAttributedString *)styleGetH1AttributedString:(nullable NSString *)string {
+    return [MFStyler styleGetAttributedString:string font:[MFStyler fontH1] color:[UIColor blackColor]];
 }
 
-+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string {
++ (nonnull NSAttributedString *)styleGetH2AttributedString:(nullable NSString *)string {
+    return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor blackColor]];
+}
+
++ (nonnull NSAttributedString *)styleGetH3AttributedString:(nullable NSString *)string {
     return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]];
 }
 
++ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string {
+    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor blackColor]];
+}
+
 + (nonnull NSAttributedString *)styleGetB2AttributedString:(nullable NSString *)string {
     return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor blackColor]];
 }
 
-+ (nonnull NSAttributedString *)styleGetDisabledBodyAttributedString:(nullable NSString *)string {
-    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor mfLighterGrayColor]];
-}
-
-+ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string {
-    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfCharcoalColor]];
-}
-
 + (nonnull NSAttributedString *)styleGetB3AttributedString:(nullable NSString *)string {
-    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfGrayColor]];
+    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB3] color:[UIColor mfBattleshipGrey]];
 }
 
-+ (nonnull NSAttributedString *)styleGetSubtitleAttributedString:(nullable NSString *)string {
-    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor blackColor]];
-}
-
-+ (nonnull NSAttributedString *)styleGetDisabledSubtitleAttributedString:(nullable NSString *)string {
++ (nonnull NSAttributedString *)styleGetDisabledB1AttributedString:(nullable NSString *)string {
     return [MFStyler styleGetAttributedString:string font:[MFStyler fontB1] color:[UIColor mfLighterGrayColor]];
 }
 
++ (nonnull NSAttributedString *)styleGetDisabledB2AttributedString:(nullable NSString *)string {
+    return [MFStyler styleGetAttributedString:string font:[MFStyler fontB2] color:[UIColor mfLighterGrayColor]];
+}
+
 + (nonnull NSAttributedString *)styleGetTopAlignedAttributeStringWithLeftString:(nullable NSString *)left centerString:(nonnull NSString *)center rightString:(nullable NSString *)right withCenterStringFontSize:(CGFloat)fontSize andColor:(nonnull UIColor *)color {
     if (left == nil){
         left = @"";