diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp
index b7cbbd1cb..06b037619 100644
--- a/es-app/src/guis/GuiGamelistOptions.cpp
+++ b/es-app/src/guis/GuiGamelistOptions.cpp
@@ -128,9 +128,9 @@ GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system)
             for (unsigned int i = 0; i < numSortTypes; i++) {
                 const FileData::SortType& sort = FileSorts::SortTypes.at(i);
                 if (sort.description == sortType)
-                    mListSort->add(sort.description, &sort, 1);
+                    mListSort->add(sort.description, &sort, true);
                 else
-                    mListSort->add(sort.description, &sort, 0);
+                    mListSort->add(sort.description, &sort, false);
             }
             // Don't show the sort type option if the gamelist type is recent/last played.
             if (system->getName() != "recent")
diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp
index ca9bb3136..a02e31878 100644
--- a/es-app/src/views/gamelist/DetailedGameListView.cpp
+++ b/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -75,29 +75,29 @@ DetailedGameListView::DetailedGameListView(Window* window, FileData* root)
     addChild(&mImage);
 
     // Metadata labels + values.
-    mLblRating.setText("Rating: ");
+    mLblRating.setText("Rating: ", false);
     addChild(&mLblRating);
     addChild(&mRating);
-    mLblReleaseDate.setText("Released: ");
+    mLblReleaseDate.setText("Released: ", false);
     addChild(&mLblReleaseDate);
     addChild(&mReleaseDate);
-    mLblDeveloper.setText("Developer: ");
+    mLblDeveloper.setText("Developer: ", false);
     addChild(&mLblDeveloper);
     addChild(&mDeveloper);
-    mLblPublisher.setText("Publisher: ");
+    mLblPublisher.setText("Publisher: ", false);
     addChild(&mLblPublisher);
     addChild(&mPublisher);
-    mLblGenre.setText("Genre: ");
+    mLblGenre.setText("Genre: ", false);
     addChild(&mLblGenre);
     addChild(&mGenre);
-    mLblPlayers.setText("Players: ");
+    mLblPlayers.setText("Players: ", false);
     addChild(&mLblPlayers);
     addChild(&mPlayers);
-    mLblLastPlayed.setText("Last played: ");
+    mLblLastPlayed.setText("Last played: ", false);
     addChild(&mLblLastPlayed);
     mLastPlayed.setDisplayRelative(true);
     addChild(&mLastPlayed);
-    mLblPlayCount.setText("Times played: ");
+    mLblPlayCount.setText("Times played: ", false);
     addChild(&mLblPlayCount);
     addChild(&mPlayCount);
 
diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index 3621f2a98..efb322d9a 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -55,29 +55,29 @@ GridGameListView::GridGameListView(Window* window, FileData* root)
     populateList(root->getChildrenListToDisplay(), root);
 
     // Metadata labels + values.
-    mLblRating.setText("Rating: ");
+    mLblRating.setText("Rating: ", false);
     addChild(&mLblRating);
     addChild(&mRating);
-    mLblReleaseDate.setText("Released: ");
+    mLblReleaseDate.setText("Released: ", false);
     addChild(&mLblReleaseDate);
     addChild(&mReleaseDate);
-    mLblDeveloper.setText("Developer: ");
+    mLblDeveloper.setText("Developer: ", false);
     addChild(&mLblDeveloper);
     addChild(&mDeveloper);
-    mLblPublisher.setText("Publisher: ");
+    mLblPublisher.setText("Publisher: ", false);
     addChild(&mLblPublisher);
     addChild(&mPublisher);
-    mLblGenre.setText("Genre: ");
+    mLblGenre.setText("Genre: ", false);
     addChild(&mLblGenre);
     addChild(&mGenre);
-    mLblPlayers.setText("Players: ");
+    mLblPlayers.setText("Players: ", false);
     addChild(&mLblPlayers);
     addChild(&mPlayers);
-    mLblLastPlayed.setText("Last played: ");
+    mLblLastPlayed.setText("Last played: ", false);
     addChild(&mLblLastPlayed);
     mLastPlayed.setDisplayRelative(true);
     addChild(&mLastPlayed);
-    mLblPlayCount.setText("Times played: ");
+    mLblPlayCount.setText("Times played: ", false);
     addChild(&mLblPlayCount);
     addChild(&mPlayCount);
 
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.cpp b/es-app/src/views/gamelist/ISimpleGameListView.cpp
index f84013582..1f379e220 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGameListView.cpp
@@ -27,7 +27,7 @@ ISimpleGameListView::ISimpleGameListView(Window* window, FileData* root)
     , mBackground(window)
     , mRandomGame(nullptr)
 {
-    mHeaderText.setText("Logo Text");
+    mHeaderText.setText("Logo Text", false);
     mHeaderText.setSize(mSize.x, 0.0f);
     mHeaderText.setPosition(0.0f, 0.0f);
     mHeaderText.setHorizontalAlignment(ALIGN_CENTER);
diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
index e350ece63..33f50e600 100644
--- a/es-app/src/views/gamelist/VideoGameListView.cpp
+++ b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -92,29 +92,29 @@ VideoGameListView::VideoGameListView(Window* window, FileData* root)
     addChild(mVideo);
 
     // Metadata labels + values.
-    mLblRating.setText("Rating: ");
+    mLblRating.setText("Rating: ", false);
     addChild(&mLblRating);
     addChild(&mRating);
-    mLblReleaseDate.setText("Released: ");
+    mLblReleaseDate.setText("Released: ", false);
     addChild(&mLblReleaseDate);
     addChild(&mReleaseDate);
-    mLblDeveloper.setText("Developer: ");
+    mLblDeveloper.setText("Developer: ", false);
     addChild(&mLblDeveloper);
     addChild(&mDeveloper);
-    mLblPublisher.setText("Publisher: ");
+    mLblPublisher.setText("Publisher: ", false);
     addChild(&mLblPublisher);
     addChild(&mPublisher);
-    mLblGenre.setText("Genre: ");
+    mLblGenre.setText("Genre: ", false);
     addChild(&mLblGenre);
     addChild(&mGenre);
-    mLblPlayers.setText("Players: ");
+    mLblPlayers.setText("Players: ", false);
     addChild(&mLblPlayers);
     addChild(&mPlayers);
-    mLblLastPlayed.setText("Last played: ");
+    mLblLastPlayed.setText("Last played: ", false);
     addChild(&mLblLastPlayed);
     mLastPlayed.setDisplayRelative(true);
     addChild(&mLastPlayed);
-    mLblPlayCount.setText("Times played: ");
+    mLblPlayCount.setText("Times played: ", false);
     addChild(&mLblPlayCount);
     addChild(&mPlayCount);