diff --git a/include/core/title.h b/include/core/title.h
index 5c46724..853fa06 100644
--- a/include/core/title.h
+++ b/include/core/title.h
@@ -68,7 +68,7 @@ typedef struct {
 
 typedef enum {
     TitleNamingConvention_Full             = 0, ///< Individual titles: "{Name} [{Id}][v{Version}][{Type}]".
-                                                ///< Gamecards: "[{Name1}] [{Id1}][v{Version1}] + ... + [{NameN}] [{IdN}][v{VersionN}]".
+                                                ///< Gamecards: "{Name1} [{Id1}][v{Version1}] + ... + {NameN} [{IdN}][v{VersionN}]".
     TitleNamingConvention_IdAndVersionOnly = 1, ///< Individual titles: "{Id}_v{Version}_{Type}".
                                                 ///< Gamecards: "{TitleId1}_v{TitleVersion1}_{TitleType1} + ... + {TitleIdN}_v{TitleVersionN}_{TitleTypeN}".
     TitleNamingConvention_Count            = 2
diff --git a/include/options_tab.hpp b/include/options_tab.hpp
index 8325526..e5a5dd2 100644
--- a/include/options_tab.hpp
+++ b/include/options_tab.hpp
@@ -79,8 +79,6 @@ namespace nxdt::views
 
             nxdt::tasks::DownloadFileTask nro_task;
 
-            brls::GenericEvent::Subscription focus_event_sub;
-
             void DisplayChangelog(void);
             void DisplayUpdateProgress(void);
 
diff --git a/libs/borealis b/libs/borealis
index 2dcb0c6..abd5d6d 160000
--- a/libs/borealis
+++ b/libs/borealis
@@ -1 +1 @@
-Subproject commit 2dcb0c6f8370ae0c5de760bf612e6bf5b54ee837
+Subproject commit abd5d6dd313eb278e7f83af0a3594ef27df3fd98
diff --git a/source/options_tab.cpp b/source/options_tab.cpp
index 28bc095..e1769fc 100644
--- a/source/options_tab.cpp
+++ b/source/options_tab.cpp
@@ -202,11 +202,6 @@ namespace nxdt::views
             return this->onCancel();
         });
 
-        /* Subscribe to the global focus change event so we can rebuild hints as soon as this frame is pushed to the view stack. */
-        this->focus_event_sub = brls::Application::getGlobalFocusChangeEvent()->subscribe([this](brls::View* view) {
-            this->rebuildHints();
-        });
-
         /* Subscribe to the JSON task. */
         this->json_task.RegisterListener([this](const nxdt::tasks::DownloadTaskProgress& progress) {
             /* Return immediately if the JSON task hasn't finished. */
@@ -268,9 +263,6 @@ namespace nxdt::views
 
         /* Free JSON buffer. */
         if (this->json_buf) free(this->json_buf);
-
-        /* Unsubscribe focus event listener. */
-        brls::Application::getGlobalFocusChangeEvent()->unsubscribe(this->focus_event_sub);
     }
 
     void OptionsTabUpdateApplicationFrame::layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash)
@@ -348,27 +340,17 @@ namespace nxdt::views
             return true;
         });
 
-        /* Rebuild action hints. */
-        this->rebuildHints();
-
         /* Go to the next stage. */
         this->nextStage();
     }
 
     void OptionsTabUpdateApplicationFrame::DisplayUpdateProgress(void)
     {
-        /* Remove update action. */
-        this->registerAction("options_tab/update_app/frame/update_action"_i18n, brls::Key::PLUS, [](void) {
-            return true;
-        }, true);
+        /* Unregister update action. */
+        this->unregisterAction(brls::Key::PLUS);
 
-        /* Register cancel action once more, using a different label. */
-        this->registerAction("options_tab/update_dialog/cancel"_i18n, brls::Key::B, [this](void) {
-            return this->onCancel();
-        });
-
-        /* Rebuild action hints. */
-        this->rebuildHints();
+        /* Update cancel action label. */
+        this->updateActionHint(brls::Key::B, "options_tab/update_dialog/cancel"_i18n);
 
         /* Subscribe to the NRO task. */
         this->nro_task.RegisterListener([this](const nxdt::tasks::DownloadTaskProgress& progress) {