diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 77ae1c93b8..834f32686b 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -645,240 +645,240 @@ struct ozone_handle
 typedef struct ozone_handle ozone_handle_t;
 
 static float ozone_sidebar_gradient_top_light[16]                     = {
-      0.94, 0.94, 0.94, 1.00,
-      0.94, 0.94, 0.94, 1.00,
-      0.922, 0.922, 0.922, 1.00,
-      0.922, 0.922, 0.922, 1.00,
+   0.94f,  0.94f,  0.94f,  1.00f,
+   0.94f,  0.94f,  0.94f,  1.00f,
+   0.922f, 0.922f, 0.922f, 1.00f,
+   0.922f, 0.922f, 0.922f, 1.00f,
 };
 
 static float ozone_sidebar_gradient_bottom_light[16]                  = {
-      0.922, 0.922, 0.922, 1.00,
-      0.922, 0.922, 0.922, 1.00,
-      0.94, 0.94, 0.94, 1.00,
-      0.94, 0.94, 0.94, 1.00,
+   0.922f, 0.922f, 0.922f, 1.00f,
+   0.922f, 0.922f, 0.922f, 1.00f,
+   0.94f,  0.94f,  0.94f,  1.00f,
+   0.94f,  0.94f,  0.94f,  1.00f,
 };
 
 static float ozone_sidebar_gradient_top_dark[16]                      = {
-      0.2, 0.2, 0.2, 1.00,
-      0.2, 0.2, 0.2, 1.00,
-      0.18, 0.18, 0.18, 1.00,
-      0.18, 0.18, 0.18, 1.00,
+   0.2f,  0.2f,  0.2f,  1.00f,
+   0.2f,  0.2f,  0.2f,  1.00f,
+   0.18f, 0.18f, 0.18f, 1.00f,
+   0.18f, 0.18f, 0.18f, 1.00f,
 };
 
 static float ozone_sidebar_gradient_bottom_dark[16]                   = {
-      0.18, 0.18, 0.18, 1.00,
-      0.18, 0.18, 0.18, 1.00,
-      0.2, 0.2, 0.2, 1.00,
-      0.2, 0.2, 0.2, 1.00,
+   0.18f, 0.18f, 0.18f, 1.00f,
+   0.18f, 0.18f, 0.18f, 1.00f,
+   0.2f,  0.2f,  0.2f,  1.00f,
+   0.2f,  0.2f,  0.2f,  1.00f,
 };
 
 static float ozone_sidebar_gradient_top_nord[16]                      = {
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
-      0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
+   0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
 };
 
 static float ozone_sidebar_gradient_bottom_nord[16]                   = {
-      0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
-      0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
+   0.1921569f, 0.2196078f, 0.2705882f, 0.9f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_top_gruvbox_dark[16]              = {
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
-      0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
+   0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
 };
 
 static float ozone_sidebar_gradient_bottom_gruvbox_dark[16]           = {
-      0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
-      0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
+   0.1686275f, 0.1686275f, 0.1686275f, 0.9f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_top_boysenberry[16]               = {
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.19215686274, 0.0, 0.04705882352, 1.00,
-      0.19215686274, 0.0, 0.04705882352, 1.00,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.19215686274f, 0.0f,           0.04705882352f, 1.00f,
+   0.19215686274f, 0.0f,           0.04705882352f, 1.00f,
 };
 
 static float ozone_sidebar_gradient_bottom_boysenberry[16]            = {
-      0.19215686274, 0.0, 0.04705882352, 1.00,
-      0.19215686274, 0.0, 0.04705882352, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,      
+   0.19215686274f, 0.0f,           0.04705882352f, 1.00f,
+   0.19215686274f, 0.0f,           0.04705882352f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
 };
 
 static float ozone_sidebar_gradient_top_hacking_the_kernel[16]        = {
-      0.0, 0.13333333, 0.0, 1.0f,
-      0.0, 0.13333333, 0.0, 1.0f,
-      0.0, 0.13333333, 0.0, 1.0f,
-      0.0, 0.13333333, 0.0, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_bottom_hacking_the_kernel[16]     = {
-      0.0, 0.0666666f, 0.0, 1.0f,
-      0.0, 0.0666666f, 0.0, 1.0f,
-      0.0, 0.13333333, 0.0, 1.0f,
-      0.0, 0.13333333, 0.0, 1.0f,
+   0.0f, 0.0666666f,  0.0f, 1.0f,
+   0.0f, 0.0666666f,  0.0f, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
+   0.0f, 0.13333333f, 0.0f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_top_twilight_zone[16]             = {
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_bottom_twilight_zone[16]          = {
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_top_dracula[16]                   = {
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_bottom_dracula[16]                = {
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f, 
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f, 
 };
 
 static float ozone_sidebar_gradient_top_solarized_dark[16]            = {
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_bottom_solarized_dark[16]         = {
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_top_solarized_light[16]           = {
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
 };
 
 static float ozone_sidebar_gradient_bottom_solarized_light[16]        = {
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
 };
 
 static float ozone_sidebar_background_gray[16]                        = 
 COLOR_HEX_TO_FLOAT(0x101010, 0.0f);
 
 static float ozone_sidebar_background_light[16]                       = {
-      0.94, 0.94, 0.94, 1.00,
-      0.94, 0.94, 0.94, 1.00,
-      0.94, 0.94, 0.94, 1.00,
-      0.94, 0.94, 0.94, 1.00,
+   0.94f, 0.94f, 0.94f, 1.00f,
+   0.94f, 0.94f, 0.94f, 1.00f,
+   0.94f, 0.94f, 0.94f, 1.00f,
+   0.94f, 0.94f, 0.94f, 1.00f,
 };
 
 static float ozone_sidebar_background_dark[16]                        = {
-      0.2, 0.2, 0.2, 1.00,
-      0.2, 0.2, 0.2, 1.00,
-      0.2, 0.2, 0.2, 1.00,
-      0.2, 0.2, 0.2, 1.00,
+   0.2f, 0.2f, 0.2f, 1.00f,
+   0.2f, 0.2f, 0.2f, 1.00f,
+   0.2f, 0.2f, 0.2f, 1.00f,
+   0.2f, 0.2f, 0.2f, 1.00f,
 };
 
 static float ozone_sidebar_background_nord[16]                        = {
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
-      0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
+   0.2078431f, 0.2352941f, 0.2901961f, 1.0f,
 };
 
 static float ozone_sidebar_background_gruvbox_dark[16]                = {
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
-      0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
+   0.1960784f, 0.1882353f, 0.1843137f, 1.0f,
 };
 
 static float ozone_sidebar_background_boysenberry[16]                 = {
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
-      0.27058823529, 0.09803921568, 0.14117647058, 1.00,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 1.00f,
 };
 
 static float ozone_sidebar_background_hacking_the_kernel[16]          = {
-      0.0, 0.1333333f, 0.0, 1.0f,
-      0.0, 0.1333333f, 0.0, 1.0f,
-      0.0, 0.1333333f, 0.0, 1.0f,
-      0.0, 0.1333333f, 0.0, 1.0f,
+   0.0f, 0.1333333f, 0.0f, 1.0f,
+   0.0f, 0.1333333f, 0.0f, 1.0f,
+   0.0f, 0.1333333f, 0.0f, 1.0f,
+   0.0f, 0.1333333f, 0.0f, 1.0f,
 };
 
 static float ozone_sidebar_background_twilight_zone[16]               = {
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
 };
 
 static float ozone_sidebar_background_dracula[16]                     = {
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
-      0.2666666, 0.2784314, 0.3529412, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
+   0.2666666f, 0.2784314f, 0.3529412f, 1.0f,
 };
 
 static float ozone_sidebar_background_solarized_dark[16]              = {
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
 };
 
 static float ozone_sidebar_background_solarized_light[16]             = {
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
 };
 
 static float ozone_sidebar_background_purple_rain[16] = {
-      0.0862745, 0.0, 0.1294117, 1.0f,
-      0.0862745, 0.0, 0.1294117, 1.0f,
-      0.0862745, 0.0, 0.1294117, 1.0f,
-      0.0862745, 0.0, 0.1294117, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
 };
 
 static float ozone_background_libretro_running_gray[16]               = 
 COLOR_HEX_TO_FLOAT(0x101010, 1.0f);
 
 static float ozone_background_libretro_running_light[16]              = {
-   0.690, 0.690, 0.690, 0.75,
-   0.690, 0.690, 0.690, 0.75,
-   0.922, 0.922, 0.922, 1.0,
-   0.922, 0.922, 0.922, 1.0
+   0.690f, 0.690f, 0.690f, 0.75f,
+   0.690f, 0.690f, 0.690f, 0.75f,
+   0.922f, 0.922f, 0.922f, 1.0f,
+   0.922f, 0.922f, 0.922f, 1.0f
 };
 
 static float ozone_background_libretro_running_dark[16]               = {
-   0.176, 0.176, 0.176, 0.75,
-   0.176, 0.176, 0.176, 0.75,
-   0.178, 0.178, 0.178, 1.0,
-   0.178, 0.178, 0.178, 1.0,
+   0.176f, 0.176f, 0.176f, 0.75f,
+   0.176f, 0.176f, 0.176f, 0.75f,
+   0.178f, 0.178f, 0.178f, 1.0f,
+   0.178f, 0.178f, 0.178f, 1.0f,
 };
 
 static float ozone_background_libretro_running_nord[16]               = {
@@ -896,52 +896,52 @@ static float ozone_background_libretro_running_gruvbox_dark[16]       = {
 };
 
 static float ozone_background_libretro_running_boysenberry[16]        = {
-      0.27058823529, 0.09803921568, 0.14117647058, 0.75f,
-      0.27058823529, 0.09803921568, 0.14117647058, 0.75f,
-      0.27058823529, 0.09803921568, 0.14117647058, 0.75f,
-      0.27058823529, 0.09803921568, 0.14117647058, 0.75f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 0.75f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 0.75f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 0.75f,
+   0.27058823529f, 0.09803921568f, 0.14117647058f, 0.75f,
 };
 
 static float ozone_background_libretro_running_hacking_the_kernel[16] = {
-      0.0, 0.0666666f, 0.0, 0.75f,
-      0.0, 0.0666666f, 0.0, 0.75f,
-      0.0, 0.0666666f, 0.0, 1.0f,
-      0.0, 0.0666666f, 0.0, 1.0f,
+   0.0f, 0.0666666f, 0.0f, 0.75f,
+   0.0f, 0.0666666f, 0.0f, 0.75f,
+   0.0f, 0.0666666f, 0.0f, 1.0f,
+   0.0f, 0.0666666f, 0.0f, 1.0f,
 };
 
 static float ozone_background_libretro_running_twilight_zone[16]      = {
-      0.0078431, 0.0, 0.0156862, 0.75f,
-      0.0078431, 0.0, 0.0156862, 0.75f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
-      0.0078431, 0.0, 0.0156862, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 0.75f,
+   0.0078431f, 0.0f, 0.0156862f, 0.75f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
+   0.0078431f, 0.0f, 0.0156862f, 1.0f,
 };
 
 static float ozone_background_libretro_running_dracula[16]            = {
-      0.1568627, 0.1647058, 0.2117647, 0.75f,
-      0.1568627, 0.1647058, 0.2117647, 0.75f,
-      0.1568627, 0.1647058, 0.2117647, 1.0f,
-      0.1568627, 0.1647058, 0.2117647, 1.0f,
+   0.1568627f, 0.1647058f, 0.2117647f, 0.75f,
+   0.1568627f, 0.1647058f, 0.2117647f, 0.75f,
+   0.1568627f, 0.1647058f, 0.2117647f, 1.0f,
+   0.1568627f, 0.1647058f, 0.2117647f, 1.0f,
 };
 
 static float ozone_background_libretro_running_solarized_dark[16]     = {
-      0.0000000, 0.1294118, 0.1725490, .85f,
-      0.0000000, 0.1294118, 0.1725490, .85f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
-      0.0000000, 0.1294118, 0.1725490, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, .85f,
+   0.0000000f, 0.1294118f, 0.1725490f, .85f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
+   0.0000000f, 0.1294118f, 0.1725490f, 1.0f,
 };
 
 static float ozone_background_libretro_running_solarized_light[16]    = {
-      1.0000000, 1.0000000, 0.9294118, 0.85f,
-      1.0000000, 1.0000000, 0.9294118, 0.85f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
-      1.0000000, 1.0000000, 0.9294118, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 0.85f,
+   1.0000000f, 1.0000000f, 0.9294118f, 0.85f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
+   1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
 };
 
 static float ozone_background_libretro_running_purple_rain[16] = {
-      0.0862745, 0.0, 0.1294117, 0.75f,
-      0.0862745, 0.0, 0.1294117, 0.75f,
-      0.0862745, 0.0, 0.1294117, 1.0f,
-      0.0862745, 0.0, 0.1294117, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 0.75f,
+   0.0862745f, 0.0f, 0.1294117f, 0.75f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
+   0.0862745f, 0.0f, 0.1294117f, 1.0f,
 };
 
 static float ozone_border_gray[16]                 = COLOR_HEX_TO_FLOAT(0x303030, 1.0f);
@@ -980,17 +980,17 @@ static float ozone_border_0_purple_rain[16]        = COLOR_HEX_TO_FLOAT(0xC3A0E0
 static float ozone_border_1_purple_rain[16]        = COLOR_HEX_TO_FLOAT(0x8C3DCC, 1.0f);
 
 static ozone_theme_t ozone_theme_light = {
-   COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00),                   /* background */
+   COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00f),                  /* background */
    ozone_background_libretro_running_light,              /* background_libretro_running */
 
-   COLOR_HEX_TO_FLOAT(0x2B2B2B, 1.00),                   /* header_footer_separator */
-   COLOR_HEX_TO_FLOAT(0x333333, 1.00),                   /* text */
-   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),                   /* selection */
-   COLOR_HEX_TO_FLOAT(0x10BEC5, 1.00),                   /* selection_border */
-   COLOR_HEX_TO_FLOAT(0xCDCDCD, 1.00),                   /* entries_border */
-   COLOR_HEX_TO_FLOAT(0x333333, 1.00),                   /* entries_icon */
-   COLOR_HEX_TO_FLOAT(0x374CFF, 1.00),                   /* text_selected */
-   COLOR_HEX_TO_FLOAT(0xF0F0F0, 1.00),                   /* message_background */
+   COLOR_HEX_TO_FLOAT(0x2B2B2B, 1.00f),                  /* header_footer_separator */
+   COLOR_HEX_TO_FLOAT(0x333333, 1.00f),                  /* text */
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f),                  /* selection */
+   COLOR_HEX_TO_FLOAT(0x10BEC5, 1.00f),                  /* selection_border */
+   COLOR_HEX_TO_FLOAT(0xCDCDCD, 1.00f),                  /* entries_border */
+   COLOR_HEX_TO_FLOAT(0x333333, 1.00f),                  /* entries_icon */
+   COLOR_HEX_TO_FLOAT(0x374CFF, 1.00f),                  /* text_selected */
+   COLOR_HEX_TO_FLOAT(0xF0F0F0, 1.00f),                  /* message_background */
 
    0x333333FF,                                           /* text_rgba */
    0x333333FF,                                           /* text_sidebar_rgba */
@@ -1013,17 +1013,17 @@ static ozone_theme_t ozone_theme_light = {
 };
 
 static ozone_theme_t ozone_theme_dark = {
-   COLOR_HEX_TO_FLOAT(0x2D2D2D, 1.00),                   /* background */
+   COLOR_HEX_TO_FLOAT(0x2D2D2D, 1.00f),                  /* background */
    ozone_background_libretro_running_dark,               /* background_libretro_running */
 
-   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),                   /* header_footer_separator */
-   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),                   /* text */
-   COLOR_HEX_TO_FLOAT(0x212227, 1.00),                   /* selection */
-   COLOR_HEX_TO_FLOAT(0x2DA3CB, 1.00),                   /* selection_border */
-   COLOR_HEX_TO_FLOAT(0x51514F, 1.00),                   /* entries_border */
-   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),                   /* entries_icon */
-   COLOR_HEX_TO_FLOAT(0x00D9AE, 1.00),                   /* text_selected */
-   COLOR_HEX_TO_FLOAT(0x464646, 1.00),                   /* message_background */
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f),                  /* header_footer_separator */
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f),                  /* text */
+   COLOR_HEX_TO_FLOAT(0x212227, 1.00f),                  /* selection */
+   COLOR_HEX_TO_FLOAT(0x2DA3CB, 1.00f),                  /* selection_border */
+   COLOR_HEX_TO_FLOAT(0x51514F, 1.00f),                  /* entries_border */
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f),                  /* entries_icon */
+   COLOR_HEX_TO_FLOAT(0x00D9AE, 1.00f),                  /* text_selected */
+   COLOR_HEX_TO_FLOAT(0x464646, 1.00f),                  /* message_background */
 
    0xFFFFFFFF,                                           /* text_rgba */
    0xFFFFFFFF,                                           /* text_sidebar_rgba */
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index dfa2448abc..9eb07376e5 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -438,35 +438,35 @@ typedef struct xmb_handle
 } xmb_handle_t;
 
 static float xmb_scale_mod[8]   = {
-   1, 1, 1, 1, 1, 1, 1, 1
+   1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f
 };
 
-static float xmb_coord_shadow[] = {
-   0, 0, 0, 0,
-   0, 0, 0, 0,
-   0, 0, 0, 0,
-   0, 0, 0, 0
+static float xmb_coord_shadow[]       = {
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
 };
 
-static float xmb_coord_black[]  = {
-   0, 0, 0, 0,
-   0, 0, 0, 0,
-   0, 0, 0, 0,
-   0, 0, 0, 0
+static float xmb_coord_black[]       = {
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
+   0.0f, 0.0f, 0.0f, 0.0f,
 };
 
-static float xmb_coord_white[]  = {
-   1, 1, 1, 1,
-   1, 1, 1, 1,
-   1, 1, 1, 1,
-   1, 1, 1, 1
+static float xmb_coord_white[]       = {
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
 };
 
 static float xmb_item_color[]       = {
-   1, 1, 1, 1,
-   1, 1, 1, 1,
-   1, 1, 1, 1,
-   1, 1, 1, 1
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
+   1.0f, 1.0f, 1.0f, 1.0f,
 };
 
 static INLINE float xmb_item_y(const xmb_handle_t *xmb, int i, size_t current)