diff --git a/TeroStyle/ComboBox.qml b/TeroStyle/ComboBox.qml
index cc04628..0fb2a8f 100644
--- a/TeroStyle/ComboBox.qml
+++ b/TeroStyle/ComboBox.qml
@@ -18,7 +18,24 @@ T.ComboBox
         height: 47
         radius: Dimensions.radius
     }
+    contentItem: T.TextField {
+        autoScroll: control.editable
+        color: Colors.foreground
+        enabled: control.editable
+        font: Typography.body
+        inputMethodHints: control.inputMethodHints
+        readOnly: control.down
+        selectByMouse: control.selectTextByMouse
+        text: control.editable ? control.editText : control.displayText
+        validator: control.validator
+    }
+    delegate: MenuItem {
+        id: menuItem
 
+        required property int index
+        required property var model
+
+<<<<<<< HEAD
     delegate: T.ItemDelegate
     {
         width: control.width
@@ -32,27 +49,48 @@ T.ComboBox
             elide: Text.ElideRight
             verticalAlignment: Text.AlignVCenter
         }
+=======
+>>>>>>> main
         highlighted: control.highlightedIndex === index
+        hoverEnabled: control.hoverEnabled
+        text: model[control.textRole]
+        width: control.width
+
+        background: Rectangle {
+            color: menuItem.down || menuItem.highlighted ? Colors.primary : "transparent"
+            height: menuItem.height
+            width: menuItem.width
+        }
     }
+<<<<<<< HEAD
     indicator: Label
     {
         x: control.width - width
+=======
+    indicator: Label {
+>>>>>>> main
         height: control.height
-        width: contentWidth + Dimensions.s * 2
-        text: "▼"
-        verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         padding: Dimensions.s
+        text: "▼"
+        verticalAlignment: Text.AlignVCenter
+        width: contentWidth + Dimensions.s * 2
+        x: control.width - width
 
+<<<<<<< HEAD
         background:  Rectangle
         {
+=======
+        background: Rectangle {
+>>>>>>> main
             anchors.fill: parent
+            border.color: Colors.interactive
+            bottomRightRadius: Dimensions.radius
             color: Colors.primary
             topRightRadius: Dimensions.radius
-            bottomRightRadius: Dimensions.radius
-            border.color: Colors.interactive
         }
     }
+<<<<<<< HEAD
 
     popup: T.Popup
     {
@@ -61,16 +99,34 @@ T.ComboBox
         width: control.width
         contentItem: ListView
         {
+=======
+    popup: T.Popup {
+        width: control.width
+        height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
+        topMargin: 6
+        bottomMargin: 6
+        padding: 1
+
+        background: Rectangle {
+            border.color: Colors.interactive
+            color: Colors.mantle
+            radius: Dimensions.radius
+        }
+        contentItem: ListView {
+>>>>>>> main
             clip: true
+            currentIndex: control.highlightedIndex
             implicitHeight: contentHeight
             model: control.popup.visible ? control.delegateModel : null
-            currentIndex: control.highlightedIndex
+            
+            T.ScrollBar.vertical: ScrollBar { }
 
             highlight: Rectangle
             {
                 color: Colors.primary
                 opacity: Colors.highlightOpacity
             }
+<<<<<<< HEAD
 
             ScrollIndicator.vertical: ScrollIndicator {}
         }
@@ -80,6 +136,8 @@ T.ComboBox
             color: Colors.mantle
             border.color: Colors.interactive
             radius: Dimensions.radius
+=======
+>>>>>>> main
         }
     }
 }