diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 047a349..e427796 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -73,13 +73,14 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     }()
 
     lazy var eyebrowTokenColorView = {
-        PickerSelectorView(title: "paletteBlack",
+        PickerSelectorView(title: "",
                            picker: self.picker,
                            items: UIColor.VDSColor.allCases)
+        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
     }()
 
     lazy var eyebrowCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom) { [weak self] picker in
+        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
             self?.colorPickerType = picker.pickerType
             self?.selectedColorTapped(picker)
         }
@@ -95,13 +96,14 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     }()
     
     lazy var titleTokenColorView = {
-        PickerSelectorView(title: "paletteBlack",
+        PickerSelectorView(title: "",
                            picker: self.picker,
                            items: UIColor.VDSColor.allCases)
+        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
     }()
 
     lazy var titleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom) { [weak self] picker in
+        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
             self?.colorPickerType = picker.pickerType
             self?.selectedColorTapped(picker)
         }
@@ -117,13 +119,14 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
     }()
     
     lazy var subtitleTokenColorView = {
-        PickerSelectorView(title: "paletteBlack",
+        PickerSelectorView(title: "",
                            picker: self.picker,
                            items: UIColor.VDSColor.allCases)
+        .with { $0.text = UIColor.VDSColor.paletteBlack.rawValue }
     }()
 
     lazy var subtitleCustomColorView: ColorPickerView<ColorPickerType> = {
-        return .init(with: ColorPickerType.custom) { [weak self] picker in
+        return .init(with: ColorPickerType.custom, color: .black) { [weak self] picker in
             self?.colorPickerType = picker.pickerType
             self?.selectedColorTapped(picker)
         }
@@ -330,9 +333,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
             self?.currentLabelType = .eyebrow
             self?.eyebrowTokenFormStackView.isHidden = item != .token
             self?.eyebrowColorFormStackView.isHidden = item != .custom
-            if item != .custom && item != .token {
-                self?.setOtherModels()
-            }
+            self?.setOtherModels()
         }
         
         eyebrowTokenColorView.onPickerDidSelect  = {  [weak self] item in
@@ -343,9 +344,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
             self?.currentLabelType = .title
             self?.titleTokenFormStackView.isHidden = item != .token
             self?.titleColorFormStackView.isHidden = item != .custom
-            if item != .custom && item != .token {
-                self?.setTitleModel()
-            }
+            self?.setTitleModel()
         }
         
         titleTokenColorView.onPickerDidSelect  = {  [weak self] item in
@@ -356,9 +355,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
             self?.currentLabelType = .subtitle
             self?.subtitleTokenFormStackView.isHidden = item != .token
             self?.subtitleColorFormStackView.isHidden = item != .custom
-            if item != .custom && item != .token {
-                self?.setOtherModels()
-            }
+            self?.setOtherModels()
         }
         
         subtitleTokenColorView.onPickerDidSelect  = {  [weak self] item in