diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m
index 80f350fea..2a0ed3db7 100644
--- a/Libraries/Text/RCTTextManager.m
+++ b/Libraries/Text/RCTTextManager.m
@@ -23,6 +23,8 @@
   return [[RCTShadowText alloc] init];
 }
 
+#pragma mark - View properties
+
 RCT_REMAP_VIEW_PROPERTY(containerBackgroundColor, backgroundColor)
 RCT_CUSTOM_VIEW_PROPERTY(numberOfLines, RCTText)
 {
@@ -34,6 +36,8 @@ RCT_CUSTOM_VIEW_PROPERTY(numberOfLines, RCTText)
   view.lineBreakMode = truncationMode;
 }
 
+#pragma mark - Shadow properties
+
 RCT_CUSTOM_SHADOW_PROPERTY(backgroundColor, RCTShadowText)
 {
   view.textBackgroundColor = json ? [RCTConvert UIColor:json] : defaultView.textBackgroundColor;
diff --git a/ReactKit/Base/RCTConvert.h b/ReactKit/Base/RCTConvert.h
index d4baaf19a..3c1afaad7 100644
--- a/ReactKit/Base/RCTConvert.h
+++ b/ReactKit/Base/RCTConvert.h
@@ -36,6 +36,7 @@
 
 + (NSTextAlignment)NSTextAlignment:(id)json;
 + (NSWritingDirection)NSWritingDirection:(id)json;
++ (UITextAutocapitalizationType)UITextAutocapitalizationType:(id)json;
 + (UIKeyboardType)UIKeyboardType:(id)json;
 
 + (CGFloat)CGFloat:(id)json;
diff --git a/ReactKit/Views/RCTTextFieldManager.m b/ReactKit/Views/RCTTextFieldManager.m
index 6f3924223..9576935b9 100644
--- a/ReactKit/Views/RCTTextFieldManager.m
+++ b/ReactKit/Views/RCTTextFieldManager.m
@@ -17,20 +17,24 @@
 
 RCT_EXPORT_VIEW_PROPERTY(caretHidden)
 RCT_EXPORT_VIEW_PROPERTY(autoCorrect)
-RCT_REMAP_VIEW_PROPERTY(autoCapitalize, autocapitalizationType)
 RCT_EXPORT_VIEW_PROPERTY(enabled)
 RCT_EXPORT_VIEW_PROPERTY(placeholder)
 RCT_EXPORT_VIEW_PROPERTY(text)
 RCT_EXPORT_VIEW_PROPERTY(clearButtonMode)
 RCT_EXPORT_VIEW_PROPERTY(keyboardType)
 RCT_REMAP_VIEW_PROPERTY(color, textColor)
+RCT_CUSTOM_VIEW_PROPERTY(autoCapitalize, RCTTextField)
+{
+  view.autocapitalizationType = json ? [RCTConvert UITextAutocapitalizationType:json]
+                                     : defaultView.autocapitalizationType;
+}
 RCT_CUSTOM_VIEW_PROPERTY(fontSize, RCTTextField)
 {
   view.font = [RCTConvert UIFont:view.font withSize:json ?: @(defaultView.font.pointSize)];
 }
 RCT_CUSTOM_VIEW_PROPERTY(fontWeight, RCTTextField)
 {
-  view.font = [RCTConvert UIFont:view.font withWeight:json]; // TODO
+  view.font = [RCTConvert UIFont:view.font withWeight:json]; // TODO: default value
 }
 RCT_CUSTOM_VIEW_PROPERTY(fontFamily, RCTTextField)
 {
diff --git a/ReactKit/Views/RCTViewManager.m b/ReactKit/Views/RCTViewManager.m
index 011f66f24..151f72cfe 100644
--- a/ReactKit/Views/RCTViewManager.m
+++ b/ReactKit/Views/RCTViewManager.m
@@ -62,7 +62,7 @@
   return nil;
 }
 
-// View properties
+#pragma mark - View properties
 
 RCT_EXPORT_VIEW_PROPERTY(accessibilityLabel)
 RCT_EXPORT_VIEW_PROPERTY(hidden)
@@ -110,7 +110,7 @@ RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTView)
   }
 }
 
-// ShadowView properties
+#pragma mark - ShadowView properties
 
 RCT_CUSTOM_SHADOW_PROPERTY(backgroundColor, RCTShadowView)
 {