diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj
index 445a519f7..3ede74294 100644
--- a/Frameworks/AppKit/Browser.environment/AppKit.sj
+++ b/Frameworks/AppKit/Browser.environment/AppKit.sj
@@ -57965,7 +57965,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("previousMonth"), functi
 
 ,["CPDate","CPDate"])]);
 }
-p;24;_CPDatePickerTextField.jt;33234;@STATIC;1.0;i;11;CPControl.ji;8;CPFont.ji;13;CPTextField.ji;11;CPStepper.jI;20;Foundation/CPArray.jI;21;Foundation/CPObject.jI;19;Foundation/CPDate.jI;28;Foundation/CPDateFormatter.jI;21;Foundation/CPLocale.ji;26;_CPDatePickerElementView.jt;32987;objj_executeFile("CPControl.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPStepper.j", YES);objj_executeFile("Foundation/CPArray.j", NO);objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("Foundation/CPDate.j", NO);objj_executeFile("Foundation/CPDateFormatter.j", NO);objj_executeFile("Foundation/CPLocale.j", NO);objj_executeFile("_CPDatePickerElementView.j", YES);var CPZeroKeyCode = 48,
+p;24;_CPDatePickerTextField.jt;35861;@STATIC;1.0;i;11;CPControl.ji;8;CPFont.ji;13;CPTextField.ji;11;CPStepper.jI;20;Foundation/CPArray.jI;21;Foundation/CPObject.jI;19;Foundation/CPDate.jI;28;Foundation/CPDateFormatter.jI;21;Foundation/CPLocale.ji;26;_CPDatePickerElementView.jt;35614;objj_executeFile("CPControl.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPStepper.j", YES);objj_executeFile("Foundation/CPArray.j", NO);objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("Foundation/CPDate.j", NO);objj_executeFile("Foundation/CPDateFormatter.j", NO);objj_executeFile("Foundation/CPLocale.j", NO);objj_executeFile("_CPDatePickerElementView.j", YES);var CPZeroKeyCode = 48,
     CPNineKeyCode = 57,
     CPMajAKeyCode = 65,
     CPMajPKeyCode = 80,
@@ -58116,20 +58116,23 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
     ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     if (!self._currentTextField)
     {
+        var targetField = nil;
         if (flags & CPShiftKeyMask)
         {
             if (((___r1 = self._lastTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["isHidden"] || _objj_forward)(___r1, "isHidden")))
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._lastTextField));
+                targetField = (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._lastTextField);
             else
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", self._lastTextField);
+                targetField = self._lastTextField;
         }
         else
         {
             if (((___r1 = self._firstTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["isHidden"] || _objj_forward)(___r1, "isHidden")))
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._firstTextField));
+                targetField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._firstTextField);
             else
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", self._firstTextField);
+                targetField = self._firstTextField;
         }
+        if (targetField)
+            (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", targetField);
     }
     var ___r1;
 }
@@ -58206,29 +58209,89 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 
 ,["BOOL","CPEvent"]), new objj_method(sel_getUid("_nextVisibleTextFieldFrom:"), function $_CPDatePickerTextField___nextVisibleTextFieldFrom_(self, _cmd, aTextField)
 {
-    var next = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["nextTextField"] || _objj_forward)(aTextField, "nextTextField"));
-    while (next && (next == null ? next : (next.isa.method_msgSend["isHidden"] || _objj_forward)(next, "isHidden")))
-        next = (next == null ? next : (next.isa.method_msgSend["nextTextField"] || _objj_forward)(next, "nextTextField"));
-    return next;
+    var runner = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["nextTextField"] || _objj_forward)(aTextField, "nextTextField"));
+    if (!runner || runner == self._firstTextField)
+        return nil;
+    while (runner && (runner == null ? runner : (runner.isa.method_msgSend["isHidden"] || _objj_forward)(runner, "isHidden")))
+    {
+        if (runner == self._lastTextField)
+            return nil;
+        runner = (runner == null ? runner : (runner.isa.method_msgSend["nextTextField"] || _objj_forward)(runner, "nextTextField"));
+        if (runner == self._firstTextField)
+            return nil;
+    }
+    return runner;
 }
 
 ,["_CPDatePickerElementTextField","_CPDatePickerElementTextField"]), new objj_method(sel_getUid("_previousVisibleTextFieldFrom:"), function $_CPDatePickerTextField___previousVisibleTextFieldFrom_(self, _cmd, aTextField)
 {
-    var prev = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["previousTextField"] || _objj_forward)(aTextField, "previousTextField"));
-    while (prev && (prev == null ? prev : (prev.isa.method_msgSend["isHidden"] || _objj_forward)(prev, "isHidden")))
-        prev = (prev == null ? prev : (prev.isa.method_msgSend["previousTextField"] || _objj_forward)(prev, "previousTextField"));
-    return prev;
+    var runner = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["previousTextField"] || _objj_forward)(aTextField, "previousTextField"));
+    if (!runner || runner == self._lastTextField)
+        return nil;
+    while (runner && (runner == null ? runner : (runner.isa.method_msgSend["isHidden"] || _objj_forward)(runner, "isHidden")))
+    {
+        if (runner == self._firstTextField)
+            return nil;
+        runner = (runner == null ? runner : (runner.isa.method_msgSend["previousTextField"] || _objj_forward)(runner, "previousTextField"));
+        if (runner == self._lastTextField)
+            return nil;
+    }
+    return runner;
 }
 
 ,["_CPDatePickerElementTextField","_CPDatePickerElementTextField"]), new objj_method(sel_getUid("insertTab:"), function $_CPDatePickerTextField__insertTab_(self, _cmd, sender)
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     var nextField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._currentTextField);
     if (nextField)
+    {
         (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", nextField);
+    }
     else
-        ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["selectNextKeyView:"] || _objj_forward)(___r1, "selectNextKeyView:", self));
+    {
+        var nextView = ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["nextValidKeyView"] || _objj_forward)(___r1, "nextValidKeyView"));
+        while (nextView && (nextView == null ? nextView : (nextView.isa.method_msgSend["isDescendantOf:"] || _objj_forward)(nextView, "isDescendantOf:", self)))
+        {
+            if (nextView == self._currentTextField)
+            {
+                nextView = nil;
+                break;
+            }
+            nextView = (nextView == null ? nextView : (nextView.isa.method_msgSend["nextValidKeyView"] || _objj_forward)(nextView, "nextValidKeyView"));
+        }
+        if (nextView)
+            ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["makeFirstResponder:"] || _objj_forward)(___r1, "makeFirstResponder:", nextView));
+    }
+    var ___r1;
+}
+
+,["void","id"]), new objj_method(sel_getUid("insertBacktab:"), function $_CPDatePickerTextField__insertBacktab_(self, _cmd, sender)
+{
+    if (!self._currentTextField)
+        return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
+    var prevField = (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._currentTextField);
+    if (prevField)
+    {
+        (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", prevField);
+    }
+    else
+    {
+        var prevView = ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["previousValidKeyView"] || _objj_forward)(___r1, "previousValidKeyView"));
+        while (prevView && (prevView == null ? prevView : (prevView.isa.method_msgSend["isDescendantOf:"] || _objj_forward)(prevView, "isDescendantOf:", self)))
+        {
+            if (prevView == self._currentTextField)
+            {
+                prevView = nil;
+                break;
+            }
+            prevView = (prevView == null ? prevView : (prevView.isa.method_msgSend["previousValidKeyView"] || _objj_forward)(prevView, "previousValidKeyView"));
+        }
+        if (prevView)
+            ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["makeFirstResponder:"] || _objj_forward)(___r1, "makeFirstResponder:", prevView));
+    }
     var ___r1;
 }
 
@@ -58236,19 +58299,10 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     var nextField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._currentTextField);
     if (nextField)
         (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", nextField);
-}
-
-,["void","id"]), new objj_method(sel_getUid("insertBacktab:"), function $_CPDatePickerTextField__insertBacktab_(self, _cmd, sender)
-{
-    if (!self._currentTextField)
-        return;
-    if (self._currentTextField == self._firstTextField)
-        ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["selectPreviousKeyView:"] || _objj_forward)(___r1, "selectPreviousKeyView:", self));
-    else
-        (self.isa.method_msgSend["moveLeft:"] || _objj_forward)(self, "moveLeft:", sender);
     var ___r1;
 }
 
@@ -58256,6 +58310,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["previousTextField"] || _objj_forward)(___r1, "previousTextField")));
     var ___r1;
 }
diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
index 1b8eb97ab..129788b3d 100644
--- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj
+++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
@@ -55866,7 +55866,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("previousMonth"), functi
 
 ,["CPDate","CPDate"])]);
 }
-p;24;_CPDatePickerTextField.jt;32827;@STATIC;1.0;i;11;CPControl.ji;8;CPFont.ji;13;CPTextField.ji;11;CPStepper.jI;20;Foundation/CPArray.jI;21;Foundation/CPObject.jI;19;Foundation/CPDate.jI;28;Foundation/CPDateFormatter.jI;21;Foundation/CPLocale.ji;26;_CPDatePickerElementView.jt;32580;objj_executeFile("CPControl.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPStepper.j", YES);objj_executeFile("Foundation/CPArray.j", NO);objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("Foundation/CPDate.j", NO);objj_executeFile("Foundation/CPDateFormatter.j", NO);objj_executeFile("Foundation/CPLocale.j", NO);objj_executeFile("_CPDatePickerElementView.j", YES);var CPZeroKeyCode = 48,
+p;24;_CPDatePickerTextField.jt;35454;@STATIC;1.0;i;11;CPControl.ji;8;CPFont.ji;13;CPTextField.ji;11;CPStepper.jI;20;Foundation/CPArray.jI;21;Foundation/CPObject.jI;19;Foundation/CPDate.jI;28;Foundation/CPDateFormatter.jI;21;Foundation/CPLocale.ji;26;_CPDatePickerElementView.jt;35207;objj_executeFile("CPControl.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPStepper.j", YES);objj_executeFile("Foundation/CPArray.j", NO);objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("Foundation/CPDate.j", NO);objj_executeFile("Foundation/CPDateFormatter.j", NO);objj_executeFile("Foundation/CPLocale.j", NO);objj_executeFile("_CPDatePickerElementView.j", YES);var CPZeroKeyCode = 48,
     CPNineKeyCode = 57,
     CPMajAKeyCode = 65,
     CPMajPKeyCode = 80,
@@ -56011,20 +56011,23 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
     ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     if (!self._currentTextField)
     {
+        var targetField = nil;
         if (flags & CPShiftKeyMask)
         {
             if (((___r1 = self._lastTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["isHidden"] || _objj_forward)(___r1, "isHidden")))
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._lastTextField));
+                targetField = (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._lastTextField);
             else
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", self._lastTextField);
+                targetField = self._lastTextField;
         }
         else
         {
             if (((___r1 = self._firstTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["isHidden"] || _objj_forward)(___r1, "isHidden")))
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._firstTextField));
+                targetField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._firstTextField);
             else
-                (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", self._firstTextField);
+                targetField = self._firstTextField;
         }
+        if (targetField)
+            (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", targetField);
     }
     var ___r1;
 }
@@ -56101,29 +56104,89 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 
 ,["BOOL","CPEvent"]), new objj_method(sel_getUid("_nextVisibleTextFieldFrom:"), function $_CPDatePickerTextField___nextVisibleTextFieldFrom_(self, _cmd, aTextField)
 {
-    var next = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["nextTextField"] || _objj_forward)(aTextField, "nextTextField"));
-    while (next && (next == null ? next : (next.isa.method_msgSend["isHidden"] || _objj_forward)(next, "isHidden")))
-        next = (next == null ? next : (next.isa.method_msgSend["nextTextField"] || _objj_forward)(next, "nextTextField"));
-    return next;
+    var runner = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["nextTextField"] || _objj_forward)(aTextField, "nextTextField"));
+    if (!runner || runner == self._firstTextField)
+        return nil;
+    while (runner && (runner == null ? runner : (runner.isa.method_msgSend["isHidden"] || _objj_forward)(runner, "isHidden")))
+    {
+        if (runner == self._lastTextField)
+            return nil;
+        runner = (runner == null ? runner : (runner.isa.method_msgSend["nextTextField"] || _objj_forward)(runner, "nextTextField"));
+        if (runner == self._firstTextField)
+            return nil;
+    }
+    return runner;
 }
 
 ,["_CPDatePickerElementTextField","_CPDatePickerElementTextField"]), new objj_method(sel_getUid("_previousVisibleTextFieldFrom:"), function $_CPDatePickerTextField___previousVisibleTextFieldFrom_(self, _cmd, aTextField)
 {
-    var prev = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["previousTextField"] || _objj_forward)(aTextField, "previousTextField"));
-    while (prev && (prev == null ? prev : (prev.isa.method_msgSend["isHidden"] || _objj_forward)(prev, "isHidden")))
-        prev = (prev == null ? prev : (prev.isa.method_msgSend["previousTextField"] || _objj_forward)(prev, "previousTextField"));
-    return prev;
+    var runner = (aTextField == null ? aTextField : (aTextField.isa.method_msgSend["previousTextField"] || _objj_forward)(aTextField, "previousTextField"));
+    if (!runner || runner == self._lastTextField)
+        return nil;
+    while (runner && (runner == null ? runner : (runner.isa.method_msgSend["isHidden"] || _objj_forward)(runner, "isHidden")))
+    {
+        if (runner == self._firstTextField)
+            return nil;
+        runner = (runner == null ? runner : (runner.isa.method_msgSend["previousTextField"] || _objj_forward)(runner, "previousTextField"));
+        if (runner == self._lastTextField)
+            return nil;
+    }
+    return runner;
 }
 
 ,["_CPDatePickerElementTextField","_CPDatePickerElementTextField"]), new objj_method(sel_getUid("insertTab:"), function $_CPDatePickerTextField__insertTab_(self, _cmd, sender)
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     var nextField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._currentTextField);
     if (nextField)
+    {
         (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", nextField);
+    }
     else
-        ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["selectNextKeyView:"] || _objj_forward)(___r1, "selectNextKeyView:", self));
+    {
+        var nextView = ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["nextValidKeyView"] || _objj_forward)(___r1, "nextValidKeyView"));
+        while (nextView && (nextView == null ? nextView : (nextView.isa.method_msgSend["isDescendantOf:"] || _objj_forward)(nextView, "isDescendantOf:", self)))
+        {
+            if (nextView == self._currentTextField)
+            {
+                nextView = nil;
+                break;
+            }
+            nextView = (nextView == null ? nextView : (nextView.isa.method_msgSend["nextValidKeyView"] || _objj_forward)(nextView, "nextValidKeyView"));
+        }
+        if (nextView)
+            ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["makeFirstResponder:"] || _objj_forward)(___r1, "makeFirstResponder:", nextView));
+    }
+    var ___r1;
+}
+
+,["void","id"]), new objj_method(sel_getUid("insertBacktab:"), function $_CPDatePickerTextField__insertBacktab_(self, _cmd, sender)
+{
+    if (!self._currentTextField)
+        return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
+    var prevField = (self.isa.method_msgSend["_previousVisibleTextFieldFrom:"] || _objj_forward)(self, "_previousVisibleTextFieldFrom:", self._currentTextField);
+    if (prevField)
+    {
+        (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", prevField);
+    }
+    else
+    {
+        var prevView = ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["previousValidKeyView"] || _objj_forward)(___r1, "previousValidKeyView"));
+        while (prevView && (prevView == null ? prevView : (prevView.isa.method_msgSend["isDescendantOf:"] || _objj_forward)(prevView, "isDescendantOf:", self)))
+        {
+            if (prevView == self._currentTextField)
+            {
+                prevView = nil;
+                break;
+            }
+            prevView = (prevView == null ? prevView : (prevView.isa.method_msgSend["previousValidKeyView"] || _objj_forward)(prevView, "previousValidKeyView"));
+        }
+        if (prevView)
+            ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["makeFirstResponder:"] || _objj_forward)(___r1, "makeFirstResponder:", prevView));
+    }
     var ___r1;
 }
 
@@ -56131,19 +56194,10 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     var nextField = (self.isa.method_msgSend["_nextVisibleTextFieldFrom:"] || _objj_forward)(self, "_nextVisibleTextFieldFrom:", self._currentTextField);
     if (nextField)
         (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", nextField);
-}
-
-,["void","id"]), new objj_method(sel_getUid("insertBacktab:"), function $_CPDatePickerTextField__insertBacktab_(self, _cmd, sender)
-{
-    if (!self._currentTextField)
-        return;
-    if (self._currentTextField == self._firstTextField)
-        ((___r1 = (self.isa.method_msgSend["window"] || _objj_forward)(self, "window")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["selectPreviousKeyView:"] || _objj_forward)(___r1, "selectPreviousKeyView:", self));
-    else
-        (self.isa.method_msgSend["moveLeft:"] || _objj_forward)(self, "moveLeft:", sender);
     var ___r1;
 }
 
@@ -56151,6 +56205,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("firstTextField"), funct
 {
     if (!self._currentTextField)
         return;
+    ((___r1 = self._datePickerElementView), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_updateResponderTextField"] || _objj_forward)(___r1, "_updateResponderTextField"));
     (self.isa.method_msgSend["_selectTextField:"] || _objj_forward)(self, "_selectTextField:", ((___r1 = self._currentTextField), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["previousTextField"] || _objj_forward)(___r1, "previousTextField")));
     var ___r1;
 }
diff --git a/Resources/recipes.txt b/Resources/recipes.txt
index c11b77ece..8704a12c0 100644
--- a/Resources/recipes.txt
+++ b/Resources/recipes.txt
@@ -1,143 +1,143 @@
-1769624744357|ArrayController1|
-1769624744370|ArrayControllerInitialSelectionTest|
-1769624744383|ArrayControllerRemovingFirstTest|
-1769624744396|AttachedSheet|
-1769624744410|AttachedSheet2|
-1769624744423|Bindings|
-1769624744436|CGCanvasContext|
-1769624744448|CGPath|
-1769624744461|CPAlertTest|
-1769624744475|CPAnimatablePropertyContainerTest|
-1769624744487|CPAnimationContextTest|
-1769624744500|CPAnimationTest|
-1769624744513|CPBinder-echo-bug|
-1769624744526|CPBoxCibTest|
-1769624744540|CPBoxTest|
-1769624744553|CPBrowserTest|
-1769624744566|CPButtonKeyEquivalentDefaultTest|
-1769624744579|CPButtonTest|
-1769624744592|CPByteCountFormatter|
-1769624744605|CPCollectionViewNibTest|
-1769624744617|CPColor-CPImage-description|
-1769624744630|CPColorWellBindings|
-1769624744643|CPComboBoxTest|
-1769624744656|CPControlPerformClickExceptionTest|
-1769624744669|CPControlSize|
-1769624744682|CPCursor|
-1769624744695|CPDateFormatterTest|
-1769624744708|CPDatePickerTest|
-1769624744721|CPDictionaryControllerTest|
-1769624744733|CPDocumentControllerTest|
-1769624744746|CPFormatterTest|
-1769624744759|CPGraphicsTest|
-1769624744772|CPImageAndTextViewImageScaling|
-1769624744785|CPImageViewAlignmentScaling|
-1769624744798|CPImageViewTest|
-1769624744811|CPImageViewbindingsTest|
-1769624744824|CPLevelIndicator|
-1769624744837|CPLocalizationTest|
-1769624744850|CPLogTest|
-1769624744863|CPMenuCALayerTest|
-1769624744876|CPMenuEnabledBindingsTest|
-1769624744889|CPMenuKeyEquivalents|
-1769624744902|CPMenuRemoveAllTest|
-1769624744915|CPMenuSubmenuPlacementConstraints|
-1769624744928|CPMenuTest|
-1769624744941|CPOutlineViewCibTest|
-1769624744953|CPOutlineViewTest|
-1769624744967|CPOutlineViewViewBasedCibTest|
-1769624744979|CPPanelTest|
-1769624744992|CPPlatformWindow|
-1769624745005|CPPlattformWindowMinSize|
-1769624745018|CPPopUpButtonBindings|
-1769624745031|CPPopUpButtonTest|
-1769624745044|CPPopover|
-1769624745056|CPPredicateEditorCibTest|
-1769624745070|CPProgressIndicator|
-1769624745082|CPPropertyListSerializationTest|
-1769624745096|CPRadioBindings|
-1769624745109|CPRuleEditorCibTest|
-1769624745121|CPScrollView|
-1769624745135|CPScrollView2|
-1769624745148|CPSearchField|
-1769624745161|CPSearchFieldPredicateBinding|
-1769624745174|CPSegmentedControlBindings|
-1769624745186|CPSegmentedControlTest|
-1769624745199|CPSoundTest|
-1769624745212|CPSplitViewDivider|
-1769624745225|CPSplitViewTest|
-1769624745238|CPStackViewTest|
-1769624745251|CPStepperBindings|
-1769624745263|CPStepperNibTest|
-1769624745276|CPTabView2|
-1769624745289|CPTabViewBindings|
-1769624745302|CPTabViewNib|
-1769624745315|CPTableViewGroupRows|
-1769624745328|CPTextField|
-1769624745340|CPTextFieldEditingStyleTest|
-1769624745353|CPTextFieldHeightTest|
-1769624745366|CPTextFieldMovementsTest|
-1769624745379|CPTextFieldMultiline|
-1769624745392|CPTextView|
-1769624745405|CPTextViewCibTest|
-1769624745418|CPTextViewDelegateAndNotifications|
-1769624745431|CPTimeZone|
-1769624745444|CPTokenFieldTest|
-1769624745456|CPToolTip|
-1769624745469|CPToolbarTest|
-1769624745482|CPURLConnectionAsyncTest|
-1769624745495|CPURLConnectionSynchronousTest|
-1769624745508|CPUserDefaults|
-1769624745521|CPUserDefaultsControllerTest|
-1769624745534|CPUserNotificationTest|
-1769624745547|CPViewController|
-1769624745559|CPVisualEffectViewTest|
-1769624745572|CPWebViewTest|
-1769624745585|CPWebViewTest2|
-1769624745598|CPWindowLiveResizeTest|
-1769624745611|CPWindowMovableTest|
-1769624745624|CPWindowResizeStyle|
-1769624745637|ChildWindows|
-1769624745650|CompilationTests|
-1769624745663|ContinuouslyUpdatesValueBinding|
-1769624745675|CopyAndPaste|
-1769624745688|CrossOriginTest|
-1769624745701|FF4096Test|
-1769624745714|FontEnhancementTest|
-1769624745727|FontMetricsExplorer|
-1769624745740|KeyEquivalents|
-1769624745752|KeyViewLoopTest|
-1769624745765|KeyWindowInTheBackgroundActivation|
-1769624745778|LayoutTest|
-1769624745791|LoadTimeTest|
-1769624745804|LongBindings|
-1769624745817|MobileTest|
-1769624745830|MultipleValueBindings|
-1769624745843|NSBoxTest|
-1769624745856|NSBrowserTest|
-1769624745869|NewTextFieldBezel|
-1769624745881|Nib2CibAlignment|
-1769624745894|Nib2CibBaselineAlignementTest|
-1769624745907|Nib2CibSubviewsOrderTest|
-1769624745920|NibAppRemixed|
-1769624745933|PatternFillTest|
-1769624745946|PlatformWindows|
-1769624745959|PopUpButtonEscTest|
-1769624745972|ScalingTest|
-1769624745985|ScalingTest2|
-1769624745998|ScrollviewTheming|
-1769624746010|SheetWindowOrderFrontIssue|
-1769624746023|SimpleBindings2|
-1769624746036|SmartFoldersDemo|
-1769624746049|TableTest|
-1769624746061|ThemeBrowser|
-1769624746074|ThemeKitchenSink|
-1769624746087|TrackingArea|
-1769624746100|UndoRedoWithMenuUpdate|
-1769624746113|UserlandNSTest|
-1769624746126|layoutEphemeralSubviewTest|
-1769624746138|loadDynamicFrameworks|
-1769624746151|performKeyEquivalentTest|
-1769624746164|predicateWithFormat|
-1769624746177|resignFirstResponder-CPControlTextDidEndEditing|
-1769624746190|sizeToFitFix|
+1769625597869|ArrayController1|
+1769625597883|ArrayControllerInitialSelectionTest|
+1769625597896|ArrayControllerRemovingFirstTest|
+1769625597909|AttachedSheet|
+1769625597923|AttachedSheet2|
+1769625597936|Bindings|
+1769625597949|CGCanvasContext|
+1769625597963|CGPath|
+1769625597976|CPAlertTest|
+1769625597990|CPAnimatablePropertyContainerTest|
+1769625598003|CPAnimationContextTest|
+1769625598017|CPAnimationTest|
+1769625598030|CPBinder-echo-bug|
+1769625598043|CPBoxCibTest|
+1769625598057|CPBoxTest|
+1769625598071|CPBrowserTest|
+1769625598084|CPButtonKeyEquivalentDefaultTest|
+1769625598098|CPButtonTest|
+1769625598111|CPByteCountFormatter|
+1769625598125|CPCollectionViewNibTest|
+1769625598138|CPColor-CPImage-description|
+1769625598152|CPColorWellBindings|
+1769625598165|CPComboBoxTest|
+1769625598178|CPControlPerformClickExceptionTest|
+1769625598191|CPControlSize|
+1769625598205|CPCursor|
+1769625598218|CPDateFormatterTest|
+1769625598231|CPDatePickerTest|
+1769625598245|CPDictionaryControllerTest|
+1769625598258|CPDocumentControllerTest|
+1769625598271|CPFormatterTest|
+1769625598285|CPGraphicsTest|
+1769625598298|CPImageAndTextViewImageScaling|
+1769625598311|CPImageViewAlignmentScaling|
+1769625598324|CPImageViewTest|
+1769625598338|CPImageViewbindingsTest|
+1769625598351|CPLevelIndicator|
+1769625598364|CPLocalizationTest|
+1769625598378|CPLogTest|
+1769625598391|CPMenuCALayerTest|
+1769625598404|CPMenuEnabledBindingsTest|
+1769625598417|CPMenuKeyEquivalents|
+1769625598431|CPMenuRemoveAllTest|
+1769625598444|CPMenuSubmenuPlacementConstraints|
+1769625598457|CPMenuTest|
+1769625598470|CPOutlineViewCibTest|
+1769625598484|CPOutlineViewTest|
+1769625598497|CPOutlineViewViewBasedCibTest|
+1769625598510|CPPanelTest|
+1769625598524|CPPlatformWindow|
+1769625598537|CPPlattformWindowMinSize|
+1769625598550|CPPopUpButtonBindings|
+1769625598564|CPPopUpButtonTest|
+1769625598577|CPPopover|
+1769625598590|CPPredicateEditorCibTest|
+1769625598604|CPProgressIndicator|
+1769625598617|CPPropertyListSerializationTest|
+1769625598630|CPRadioBindings|
+1769625598644|CPRuleEditorCibTest|
+1769625598657|CPScrollView|
+1769625598670|CPScrollView2|
+1769625598683|CPSearchField|
+1769625598697|CPSearchFieldPredicateBinding|
+1769625598710|CPSegmentedControlBindings|
+1769625598723|CPSegmentedControlTest|
+1769625598737|CPSoundTest|
+1769625598750|CPSplitViewDivider|
+1769625598763|CPSplitViewTest|
+1769625598776|CPStackViewTest|
+1769625598790|CPStepperBindings|
+1769625598803|CPStepperNibTest|
+1769625598816|CPTabView2|
+1769625598830|CPTabViewBindings|
+1769625598843|CPTabViewNib|
+1769625598856|CPTableViewGroupRows|
+1769625598870|CPTextField|
+1769625598883|CPTextFieldEditingStyleTest|
+1769625598896|CPTextFieldHeightTest|
+1769625598909|CPTextFieldMovementsTest|
+1769625598922|CPTextFieldMultiline|
+1769625598936|CPTextView|
+1769625598949|CPTextViewCibTest|
+1769625598962|CPTextViewDelegateAndNotifications|
+1769625598976|CPTimeZone|
+1769625598989|CPTokenFieldTest|
+1769625599002|CPToolTip|
+1769625599015|CPToolbarTest|
+1769625599029|CPURLConnectionAsyncTest|
+1769625599042|CPURLConnectionSynchronousTest|
+1769625599055|CPUserDefaults|
+1769625599069|CPUserDefaultsControllerTest|
+1769625599082|CPUserNotificationTest|
+1769625599096|CPViewController|
+1769625599109|CPVisualEffectViewTest|
+1769625599122|CPWebViewTest|
+1769625599135|CPWebViewTest2|
+1769625599149|CPWindowLiveResizeTest|
+1769625599162|CPWindowMovableTest|
+1769625599175|CPWindowResizeStyle|
+1769625599188|ChildWindows|
+1769625599202|CompilationTests|
+1769625599215|ContinuouslyUpdatesValueBinding|
+1769625599228|CopyAndPaste|
+1769625599242|CrossOriginTest|
+1769625599255|FF4096Test|
+1769625599268|FontEnhancementTest|
+1769625599282|FontMetricsExplorer|
+1769625599295|KeyEquivalents|
+1769625599308|KeyViewLoopTest|
+1769625599322|KeyWindowInTheBackgroundActivation|
+1769625599335|LayoutTest|
+1769625599349|LoadTimeTest|
+1769625599363|LongBindings|
+1769625599376|MobileTest|
+1769625599390|MultipleValueBindings|
+1769625599404|NSBoxTest|
+1769625599418|NSBrowserTest|
+1769625599431|NewTextFieldBezel|
+1769625599445|Nib2CibAlignment|
+1769625599458|Nib2CibBaselineAlignementTest|
+1769625599472|Nib2CibSubviewsOrderTest|
+1769625599485|NibAppRemixed|
+1769625599498|PatternFillTest|
+1769625599512|PlatformWindows|
+1769625599525|PopUpButtonEscTest|
+1769625599539|ScalingTest|
+1769625599552|ScalingTest2|
+1769625599566|ScrollviewTheming|
+1769625599579|SheetWindowOrderFrontIssue|
+1769625599592|SimpleBindings2|
+1769625599605|SmartFoldersDemo|
+1769625599619|TableTest|
+1769625599632|ThemeBrowser|
+1769625599646|ThemeKitchenSink|
+1769625599659|TrackingArea|
+1769625599673|UndoRedoWithMenuUpdate|
+1769625599686|UserlandNSTest|
+1769625599699|layoutEphemeralSubviewTest|
+1769625599713|loadDynamicFrameworks|
+1769625599726|performKeyEquivalentTest|
+1769625599740|predicateWithFormat|
+1769625599753|resignFirstResponder-CPControlTextDidEndEditing|
+1769625599766|sizeToFitFix|