diff --git a/src/qml/presenter/LibraryItem.qml b/src/qml/presenter/LibraryItem.qml
index 8cc152b..736dd13 100644
--- a/src/qml/presenter/LibraryItem.qml
+++ b/src/qml/presenter/LibraryItem.qml
@@ -64,6 +64,7 @@ ColumnLayout {
             anchors.verticalCenter: parent.verticalCenter
             elide: Text.ElideLeft
             text: headerLabel
+            color: libraryMouseArea.containsMouse ? Kirigami.Theme.focusColor : Kirigami.Theme.textColor
         }
 
         Controls.Label {
@@ -72,7 +73,8 @@ ColumnLayout {
                      verticalCenter: libraryLabel.verticalCenter
                      leftMargin: 15}
             text: count
-            color: Kirigami.Theme.disabledTextColor
+            font.pointSize: 9
+            color: libraryMouseArea.containsMouse ? Kirigami.Theme.focusColor : Kirigami.Theme.textColor
         }
 
         Kirigami.Icon {
@@ -82,6 +84,7 @@ ColumnLayout {
                      rightMargin: 10}
             source: "arrow-down"
             rotation: selectedLibrary == libraryType ? 0 : 180
+            color: libraryMouseArea.containsMouse ? Kirigami.Theme.focusColor : Kirigami.Theme.textColor
 
             Behavior on rotation {
                 NumberAnimation {
@@ -92,7 +95,9 @@ ColumnLayout {
         }
 
         MouseArea {
+            id: libraryMouseArea
             anchors.fill: parent
+            hoverEnabled: true
             onClicked: {
                 if (selectedLibrary == libraryType)
                     selectedLibrary = ""
diff --git a/src/qml/presenter/TextBackground.qml b/src/qml/presenter/TextBackground.qml
index 15060bd..4f562a7 100644
--- a/src/qml/presenter/TextBackground.qml
+++ b/src/qml/presenter/TextBackground.qml
@@ -14,7 +14,8 @@ Item {
         color: Kirigami.Theme.backgroundColor
         anchors.fill: parent
         radius: 10
-        border.color: control.activeFocus ? Kirigami.Theme.highlightColor : (errorCondition ? Kirigami.Theme.negativeTextColor : Kirigami.Theme.backgroundColor)
+        border.width: 0.5
+        border.color: control.activeFocus ? Kirigami.Theme.highlightColor : (errorCondition ? Kirigami.Theme.negativeTextColor : Kirigami.Theme.disabledTextColor)
     }
 
     DropShadow {
diff --git a/src/qml/presenter/VideoEditor.qml b/src/qml/presenter/VideoEditor.qml
index 15a296c..6f2657d 100644
--- a/src/qml/presenter/VideoEditor.qml
+++ b/src/qml/presenter/VideoEditor.qml
@@ -33,12 +33,16 @@ Item {
                     text: "Title:"
                 }
                 Controls.TextField {
+                    id: titleId
                     implicitWidth: 300
                     hoverEnabled: true
                     placeholderText: "Song Title..."
                     text: video.title
                     padding: 10
                     onEditingFinished: updateTitle(text);
+                    background: Presenter.TextBackground {
+                        control: titleId
+                    }
                 }
 
                 Controls.CheckBox {