diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index e9b54fd74..249606753 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -2028,7 +2028,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeStateBezeled];
     [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeStateBordered];
     [self setValue:aFont forThemeAttribute:@"font" inState:CPTextFieldStateRounded];
-    [self setValue:aFont forThemeAttribute:@"font" inState:[CPTextFieldStateRounded, CPThemeStateEditing]];
+    
+    // Use CPThemeState() function to create composite states instead of array literals
+    [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeState(CPTextFieldStateRounded, CPThemeStateEditing)];
     
     // Apply across all standard control size states
     [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeStateControlSizeRegular];
@@ -2037,8 +2039,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     // Apply to table data view states (ensuring Interface Builder-style lists respect the font)
     [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeStateTableDataView];
-    [self setValue:aFont forThemeAttribute:@"font" inState:[CPThemeStateTableDataView, CPThemeStateSelectedDataView]];
-    [self setValue:aFont forThemeAttribute:@"font" inState:[CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]];
+    [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeState(CPThemeStateTableDataView, CPThemeStateSelectedDataView)];
+    [self setValue:aFont forThemeAttribute:@"font" inState:CPThemeState(CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow)];
 
     [self layoutSubviews];
 }