diff --git a/AMC.Model/Models/Song.cs b/AMC.Model/Models/Song.cs
index 5c55dc8..7ae595c 100644
--- a/AMC.Model/Models/Song.cs
+++ b/AMC.Model/Models/Song.cs
@@ -1,4 +1,5 @@
-namespace AMC.Model.Models {
+namespace AMC.Model.Models
+{
     public class Song
     {
         public int Id { get; set; }
diff --git a/AMC.View/App.xaml.cs b/AMC.View/App.xaml.cs
index d855210..4675ecb 100644
--- a/AMC.View/App.xaml.cs
+++ b/AMC.View/App.xaml.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-
-namespace AMC.View;
+namespace AMC.View;
 
 public partial class App : Application
 {
diff --git a/AMC.View/Controls/LibraryCategoryItem.xaml b/AMC.View/Controls/LibraryCategoryItem.xaml
index daffc6d..25a7156 100644
--- a/AMC.View/Controls/LibraryCategoryItem.xaml
+++ b/AMC.View/Controls/LibraryCategoryItem.xaml
@@ -13,7 +13,7 @@
                HorizontalOptions="Start" />
         <Label x:Name="CategoryLabel"
                FontSize="16"
-               TextColor="Black"
+               TextColor="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}"
                HorizontalOptions="StartAndExpand" />
         <Image Source="icon_chevron_right.png"
                WidthRequest="24"
diff --git a/AMC.View/Converters/SongsInfoConverter.cs b/AMC.View/Converters/SongsInfoConverter.cs
index 6a63476..7c0a1a3 100644
--- a/AMC.View/Converters/SongsInfoConverter.cs
+++ b/AMC.View/Converters/SongsInfoConverter.cs
@@ -8,8 +8,8 @@ namespace AMC.View.Converters
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var (songCount, totalDuration) = (ValueTuple<int, int>)value;
-            var songLabel = songCount == 1 ? Strings.SongsLabelSingular : Strings.SongsLabelPlural;
-            var minutesLabel = totalDuration == 1 ? Strings.MinutesLabelSingular : Strings.MinutesLabelPlural;
+            var songLabel = int.Abs(songCount) < 2 ? Strings.SongsLabelSingular : Strings.SongsLabelPlural;
+            var minutesLabel = int.Abs(totalDuration) < 2 ? Strings.MinutesLabelSingular : Strings.MinutesLabelPlural;
             return string.Format(
                 "{0} {1}, {2} {3}",
                 songCount,
diff --git a/AMC.View/Views/LibraryPage.xaml b/AMC.View/Views/LibraryPage.xaml
index 0071729..78efcf2 100644
--- a/AMC.View/Views/LibraryPage.xaml
+++ b/AMC.View/Views/LibraryPage.xaml
@@ -61,7 +61,7 @@
                         <StackLayout Margin="16">
                             <Border>
                                 <Border.StrokeShape>
-                                    <RoundRectangle CornerRadius="10,10,10,10" />
+                                    <RoundRectangle CornerRadius="8,8,8,8" />
                                 </Border.StrokeShape>
                                 <Image 
                                 Source="{Binding CoverImage}"