diff --git a/YogaKit/YogaKitSample/Podfile.lock b/YogaKit/YogaKitSample/Podfile.lock
index 9dcd8527..baa0e955 100644
--- a/YogaKit/YogaKitSample/Podfile.lock
+++ b/YogaKit/YogaKitSample/Podfile.lock
@@ -4,9 +4,9 @@ PODS:
   - IGListKit/Default (2.1.0):
     - IGListKit/Diffing
   - IGListKit/Diffing (2.1.0)
-  - Yoga (1.2.0)
-  - YogaKit (1.2.0):
-    - Yoga (~> 1.2)
+  - Yoga (1.3.0)
+  - YogaKit (1.3.0):
+    - Yoga (~> 1.3)
 
 DEPENDENCIES:
   - IGListKit (~> 2.1.0)
@@ -18,8 +18,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
-  Yoga: 20fc010c282cc5f3c27ce512de1329cd1e72b077
-  YogaKit: 72d5c8a806dc5cf2aa50c93a6dd88913cdbec6fe
+  Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
+  YogaKit: cddeccc6a8d2aff563e4c738d3bddb290a6de4cb
 
 PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
 
diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
index 56e9c897..cbf1d217 100644
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
@@ -15,32 +15,38 @@ final class BasicViewController: UIViewController {
 
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.width = containerSize.width
-        root.yoga.height = containerSize.height
-        root.yoga.alignItems = .center
-        root.yoga.justifyContent = .center
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = containerSize.width
+            layout.height = containerSize.height
+            layout.alignItems = .center
+            layout.justifyContent = .center
+        }
 
         let child1 = UIView()
         child1.backgroundColor = .blue
-        child1.yoga.isEnabled = true
-        child1.yoga.width = 100
-        child1.yoga.height = 10
-        child1.yoga.marginBottom = 25
+        child1.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = 100
+            layout.height = 10
+            layout.marginBottom = 25
+        }
         root.addSubview(child1)
 
-        let child2 = UIView()
-        child2.yoga.isEnabled = true
-        child2.yoga.alignSelf = .flexEnd
+        let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         child2.backgroundColor = .green
-        child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+        child2.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexEnd
+        }
         root.addSubview(child2)
 
-        let child3 = UIView()
-        child3.yoga.isEnabled = true
-        child3.yoga.alignSelf = .flexStart
+        let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
         child3.backgroundColor = .yellow
-        child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+        child3.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexStart
+        }
         root.addSubview(child3)
 
         root.yoga.applyLayout(preservingOrigin: true)
diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
index dad97ee9..62129579 100644
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
@@ -17,40 +17,50 @@ final class LayoutInclusionViewController: UIViewController {
     override func viewDidLoad() {
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.flexDirection = .column
-        root.yoga.justifyContent = .spaceAround
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .spaceAround
+        }
 
         contentView.backgroundColor = .clear
         contentView.layer.borderColor = UIColor.lightGray.cgColor
         contentView.layer.borderWidth = 1.0
-        contentView.yoga.isEnabled = true
-        contentView.yoga.height = 300
-        contentView.yoga.width = self.view.bounds.size.width
-        contentView.yoga.flexDirection = .row
-        contentView.yoga.justifyContent = .center
-        contentView.yoga.paddingHorizontal = 25
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = self.view.bounds.size.width
+            layout.flexDirection = .row
+            layout.justifyContent = .center
+            layout.paddingHorizontal = 25
+        }
         self.view.addSubview(contentView)
 
         let redView = UIView(frame: .zero)
         redView.backgroundColor = .red
-        redView.yoga.isEnabled = true
-        redView.yoga.flexGrow = 1
-        redView.yoga.flexShrink = 1
+        redView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+            layout.flexShrink = 1
+        }
         contentView.addSubview(redView)
 
         disappearingView.backgroundColor = .blue
-        disappearingView.yoga.isEnabled = true
-        disappearingView.yoga.flexGrow = 1
+        disappearingView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+        }
         contentView.addSubview(disappearingView)
 
         button.setTitle("Add Blue View", for: UIControlState.selected)
         button.setTitle("Remove Blue View", for: UIControlState.normal)
         button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
-        button.yoga.isEnabled = true
-        button.yoga.height = 300
-        button.yoga.width = 300
-        button.yoga.alignSelf = .center
+        button.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = 300
+            layout.alignSelf = .center
+        }
         root.addSubview(button)
 
         root.yoga.applyLayout(preservingOrigin: false)
diff --git a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift b/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
index 5fff40cb..5f469886 100644
--- a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
@@ -15,9 +15,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
 
-        contentView.yoga.isEnabled = true
-        contentView.yoga.flexDirection = .column
-        contentView.yoga.justifyContent = .flexEnd
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .flexEnd
+        }
 
         label.textAlignment = .center
         label.numberOfLines = 1
@@ -26,9 +28,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
 
         let border = UIView(frame: .zero)
         border.backgroundColor = .lightGray
-        border.yoga.isEnabled = true
-        border.yoga.height = 0.5
-        border.yoga.marginHorizontal = 25
+        border.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 0.5
+            layout.marginHorizontal = 25
+        }
         contentView.addSubview(border)
     }