diff --git a/CHANGELOG b/CHANGELOG
index b8331f2a..cf85506a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- Save databases if they have been upgraded
- Don't duplicate tracks in the library after a defrag
- Remove "Add New ..." menubutton and replace with Add Library Path button
+- Various UI tweaks
6.5.0-rc:
- Convert to CMake/CTest
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index 53630e36..16ddb58f 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -73,18 +73,6 @@
-
- True
- False
- 10
- 10
- media-playlist-shuffle
-
-
- True
- False
- 6
-
True
False
@@ -120,14 +108,15 @@
True
False
- 5
+ 3
+ 3
+ 3
True
False
- start
+ center
center
- 5
start
@@ -278,9 +267,17 @@
True
False
True
- o_cover
none
+
+
+ 100
+ True
+ False
+ image-missing
+ 6
+
+
1
@@ -292,18 +289,18 @@
True
True
- 5
+ True
never
True
False
- 5
True
False
start
+ center
5
5
True
@@ -389,10 +386,8 @@
True
False
- end
- start
- 9
- 10
+ end
+ end
True
@@ -401,8 +396,16 @@
Randomly pick tracks
start
center
- image9
+
+
+ True
+ False
+ 10
+ 10
+ media-playlist-shuffle
+
+
False
@@ -458,6 +461,7 @@ audio-volume-medium
3
0
+ 2
@@ -465,12 +469,13 @@ audio-volume-medium
True
False
True
- 5
+ 3
True
False
True
+ end
center
<span size='large'>0:00</span>
True
@@ -503,6 +508,7 @@ audio-volume-medium
True
False
+ start
center
15
<span size='large'>0:00</span>
@@ -521,144 +527,11 @@ audio-volume-medium
-
+
True
False
end
- start
- 5
-
-
- True
- False
- end
- Pause after
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- end
- center
- 9
- 0
-
- - (disabled)
- - this track
- - next track
- - 2 tracks
- - 3 tracks
- - 4 tracks
- - 5 tracks
- - 6 tracks
- - 7 tracks
- - 8 tracks
- - 9 tracks
- - 10 tracks
- - 11 tracks
- - 12 tracks
- - 13 tracks
- - 14 tracks
- - 15 tracks
- - 16 tracks
- - 17 tracks
- - 18 tracks
- - 19 tracks
- - 20 tracks
- - 21 tracks
- - 22 tracks
- - 23 tracks
- - 24 tracks
- - 25 tracks
- - 26 tracks
- - 27 tracks
- - 28 tracks
- - 29 tracks
- - 30 tracks
- - 31 tracks
- - 32 tracks
- - 33 tracks
- - 34 tracks
- - 35 tracks
- - 36 tracks
- - 37 tracks
- - 38 tracks
- - 39 tracks
- - 40 tracks
- - 41 tracks
- - 42 tracks
- - 43 tracks
- - 44 tracks
- - 45 tracks
- - 46 tracks
- - 47 tracks
- - 48 tracks
- - 49 tracks
- - 50 tracks
- - 51 tracks
- - 52 tracks
- - 53 tracks
- - 54 tracks
- - 55 tracks
- - 56 tracks
- - 57 tracks
- - 58 tracks
- - 59 tracks
- - 60 tracks
- - 61 tracks
- - 62 tracks
- - 63 tracks
- - 64 tracks
- - 65 tracks
- - 66 tracks
- - 67 tracks
- - 68 tracks
- - 69 tracks
- - 70 tracks
- - 71 tracks
- - 72 tracks
- - 73 tracks
- - 74 tracks
- - 75 tracks
- - 76 tracks
- - 77 tracks
- - 78 tracks
- - 79 tracks
- - 80 tracks
- - 81 tracks
- - 82 tracks
- - 83 tracks
- - 84 tracks
- - 85 tracks
- - 86 tracks
- - 87 tracks
- - 88 tracks
- - 89 tracks
- - 90 tracks
- - 91 tracks
- - 92 tracks
- - 93 tracks
- - 94 tracks
- - 95 tracks
- - 96 tracks
- - 97 tracks
- - 98 tracks
- - 99 tracks
-
-
-
-
- False
- False
- 1
-
-
+ Pause after
3
@@ -666,23 +539,140 @@ audio-volume-medium
2
+
+
+ True
+ False
+ end
+ center
+ 0
+
+ - (disabled)
+ - this track
+ - next track
+ - 2 tracks
+ - 3 tracks
+ - 4 tracks
+ - 5 tracks
+ - 6 tracks
+ - 7 tracks
+ - 8 tracks
+ - 9 tracks
+ - 10 tracks
+ - 11 tracks
+ - 12 tracks
+ - 13 tracks
+ - 14 tracks
+ - 15 tracks
+ - 16 tracks
+ - 17 tracks
+ - 18 tracks
+ - 19 tracks
+ - 20 tracks
+ - 21 tracks
+ - 22 tracks
+ - 23 tracks
+ - 24 tracks
+ - 25 tracks
+ - 26 tracks
+ - 27 tracks
+ - 28 tracks
+ - 29 tracks
+ - 30 tracks
+ - 31 tracks
+ - 32 tracks
+ - 33 tracks
+ - 34 tracks
+ - 35 tracks
+ - 36 tracks
+ - 37 tracks
+ - 38 tracks
+ - 39 tracks
+ - 40 tracks
+ - 41 tracks
+ - 42 tracks
+ - 43 tracks
+ - 44 tracks
+ - 45 tracks
+ - 46 tracks
+ - 47 tracks
+ - 48 tracks
+ - 49 tracks
+ - 50 tracks
+ - 51 tracks
+ - 52 tracks
+ - 53 tracks
+ - 54 tracks
+ - 55 tracks
+ - 56 tracks
+ - 57 tracks
+ - 58 tracks
+ - 59 tracks
+ - 60 tracks
+ - 61 tracks
+ - 62 tracks
+ - 63 tracks
+ - 64 tracks
+ - 65 tracks
+ - 66 tracks
+ - 67 tracks
+ - 68 tracks
+ - 69 tracks
+ - 70 tracks
+ - 71 tracks
+ - 72 tracks
+ - 73 tracks
+ - 74 tracks
+ - 75 tracks
+ - 76 tracks
+ - 77 tracks
+ - 78 tracks
+ - 79 tracks
+ - 80 tracks
+ - 81 tracks
+ - 82 tracks
+ - 83 tracks
+ - 84 tracks
+ - 85 tracks
+ - 86 tracks
+ - 87 tracks
+ - 88 tracks
+ - 89 tracks
+ - 90 tracks
+ - 91 tracks
+ - 92 tracks
+ - 93 tracks
+ - 94 tracks
+ - 95 tracks
+ - 96 tracks
+ - 97 tracks
+ - 98 tracks
+ - 99 tracks
+
+
+
+
+ 4
+ 1
+ 2
+
+