diff --git a/Makefile.libnx b/Makefile.libnx
index 709f03364c..22fc9ccc76 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -58,7 +58,7 @@ ifeq ($(HAVE_OPENGL), 1)
 
   HAVE_ZARCH = 0
   HAVE_XMB = 1
-  HAVE_OZONE = 0
+  HAVE_OZONE = 1
   HAVE_STRIPES = 0
 
   HAVE_OVERLAY = 1
diff --git a/configuration.c b/configuration.c
index 7dfa178c30..1ab4bb23fe 100644
--- a/configuration.c
+++ b/configuration.c
@@ -535,8 +535,8 @@ static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
 #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI;
-#elif defined(HAVE_OZONE) && defined(HAVE_LIBNX)
-static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE;
+/* #elif defined(HAVE_OZONE) && defined(HAVE_LIBNX)
+static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE; */
 #elif defined(HAVE_XMB) && !defined(_XBOX)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
 #elif defined(HAVE_RGUI)
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 8fdc2d8c88..fd77e559f9 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -2040,7 +2040,7 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
 
 /* TODO Reduce sidebar width ? */
 
-static void ozone_draw_cursor(ozone_handle_t *ozone, video_frame_info_t *video_info, unsigned x_offset, unsigned entry_width, size_t y, float alpha)
+static void ozone_draw_cursor(ozone_handle_t *ozone, video_frame_info_t *video_info, int x_offset, unsigned entry_width, size_t y, float alpha)
 {
    ozone_color_alpha(ozone->theme_dynamic.selection_border, alpha);
    ozone_color_alpha(ozone->theme_dynamic.selection, alpha);
@@ -2193,7 +2193,7 @@ static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_
    size_t i, y, entries_end;
    float sidebar_offset, bottom_boundary, invert, alpha_anim;
    unsigned video_info_height, entry_width;
-   unsigned x_offset      = 0;
+   int x_offset      = 0;
    size_t selection_y     = 0;
    size_t old_selection_y = 0;
 
@@ -2222,7 +2222,7 @@ static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_
          x_offset = invert * (alpha_anim * 120);  /* right */
    }
 
-   x_offset     += (unsigned) sidebar_offset;
+   x_offset     += (int) sidebar_offset;
    alpha_uint32  = (uint32_t)(alpha*255.0f);
 
    /* Borders layer */
@@ -2660,7 +2660,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
 
          new_selection = (ozone->categories_selection_ptr + 1);
 
-         if (new_selection >= ozone->system_tab_end + 2) /* TODO Check against actual tabs count and not just system tabs */
+         if (new_selection > ozone->system_tab_end) /* TODO Check against actual tabs count and not just system tabs */
             new_selection = 0;
 
          if (ozone->categories_selection_ptr != new_selection)
@@ -2699,7 +2699,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
          new_selection = ozone->categories_selection_ptr - 1;
          
          if (new_selection < 0)
-            new_selection = ozone->system_tab_end + 1; /* TODO Set this to actual tabs count and not just system tabs */
+            new_selection = ozone->system_tab_end; /* TODO Set this to actual tabs count and not just system tabs */
 
          if (ozone->categories_selection_ptr != new_selection)
          {