From 21cae62c4c7040088d4c9808cd338342babfd339 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 5 Apr 2024 08:34:26 +0100
Subject: [PATCH 01/14] - Check for and load absolute path icons

---
 src/panel/widgets/launchers.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/panel/widgets/launchers.cpp b/src/panel/widgets/launchers.cpp
index 406787fb..7d8574e3 100644
--- a/src/panel/widgets/launchers.cpp
+++ b/src/panel/widgets/launchers.cpp
@@ -34,8 +34,13 @@ struct DesktopLauncherInfo : public LauncherInfo
 
     Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(int32_t size)
     {
-        auto icon  = app_info->get_icon()->to_string();
-        auto theme = Gtk::IconTheme::get_default();
+        auto icon                 = app_info->get_icon()->to_string();
+        auto theme                = Gtk::IconTheme::get_default();
+        std::string absolute_path = "/";
+        if (!icon.compare(0, absolute_path.size(), absolute_path)) 
+        {
+            return Gdk::Pixbuf::create_from_file(icon, size, size);
+        }
 
         if (!theme->lookup_icon(icon, size))
         {

From 0e2334efb189b983b51f695207ffff1364e74ec9 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 5 Apr 2024 09:07:42 +0100
Subject: [PATCH 02/14] - Moved theme value after first potential return -
 Cleaned up some style

---
 src/panel/widgets/launchers.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/panel/widgets/launchers.cpp b/src/panel/widgets/launchers.cpp
index 7d8574e3..63063f3d 100644
--- a/src/panel/widgets/launchers.cpp
+++ b/src/panel/widgets/launchers.cpp
@@ -34,14 +34,15 @@ struct DesktopLauncherInfo : public LauncherInfo
 
     Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(int32_t size)
     {
-        auto icon                 = app_info->get_icon()->to_string();
-        auto theme                = Gtk::IconTheme::get_default();
+        auto icon = app_info->get_icon()->to_string();
         std::string absolute_path = "/";
-        if (!icon.compare(0, absolute_path.size(), absolute_path)) 
+        if (!icon.compare(0, absolute_path.size(), absolute_path))
         {
             return Gdk::Pixbuf::create_from_file(icon, size, size);
         }
 
+        auto theme = Gtk::IconTheme::get_default();
+
         if (!theme->lookup_icon(icon, size))
         {
             std::cerr << "Failed to load icon \"" << icon << "\"" << std::endl;

From 3ea04e7bd089f0c702ae6f9d06cc5589ab9bff45 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Wed, 10 Apr 2024 18:14:10 +0100
Subject: [PATCH 03/14] Add Categories to panel

---
 metadata/panel.xml         |   6 ++
 src/panel/widgets/menu.cpp | 173 +++++++++++++++++++++++++++++++++++--
 src/panel/widgets/menu.hpp |  47 +++++++++-
 3 files changed, 214 insertions(+), 12 deletions(-)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index d5e98976..5d950bb7 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -181,6 +181,12 @@
 		<hint>file</hint>
 		<default></default>
 	</option>
+	<option name="menu_min_category_width" type="int">
+		<_short>Menu Minimum Category Width</_short>
+		<default>200</default>
+		<min>50</min>
+		<max>400</max>
+	</option>
 	<option name="menu_min_content_width" type="int">
 		<_short>Menu Minimum Content Width</_short>
 		<default>500</default>
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index d2402471..115a449f 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -1,4 +1,5 @@
 #include <dirent.h>
+#include <sstream>
 
 #include <cassert>
 #include <giomm/icon.h>
@@ -17,6 +18,45 @@
 #define MAX_LAUNCHER_NAME_LENGTH 11
 const std::string default_icon = ICONDIR "/wayfire.png";
 
+WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::string _icon_name):
+    name(_name), icon_name(_icon_name)
+{
+
+}
+
+std::string WfMenuCategoryDefinition::get_name(){
+    return name;
+}
+
+std::string WfMenuCategoryDefinition::get_icon_name(){
+    return icon_name;
+}
+
+WfMenuCategoryButton::WfMenuCategoryButton(WayfireMenu *_menu, std::string _category, std::string _label, std::string _icon_name) :
+    Gtk::Button(), menu(_menu), category(_category), label(_label), icon_name(_icon_name)
+{
+    m_image.set_from_icon_name(icon_name,
+        (Gtk::IconSize)Gtk::ICON_SIZE_LARGE_TOOLBAR);
+    m_image.set_pixel_size(32);
+    m_label.set_text(label);
+    m_label.set_xalign(0.0);
+
+    m_box.pack_start(m_image, false, false, 2);
+    m_box.pack_end(m_label, true, true, 2);
+    m_box.set_homogeneous(false);
+
+    this->add(m_box);
+    this->get_style_context()->add_class("flat");
+
+    this->signal_clicked().connect_notify(
+        sigc::mem_fun(this, &WfMenuCategoryButton::on_click));
+}
+
+void WfMenuCategoryButton::on_click()
+{
+    menu->set_category(category);
+}
+
 WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, AppInfo app) :
     Gtk::HBox(), menu(_menu), m_app_info(app)
 {
@@ -148,9 +188,74 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 
     loaded_apps.insert({name, exec});
 
-    items.push_back(std::unique_ptr<WfMenuMenuItem>(
-        new WfMenuMenuItem(this, app_info)));
-    flowbox.add(*items.back());
+    /* Check if this has a 'OnlyShownIn' for a different desktop env 
+       If so, we throw it in a pile at the bottom just to be safe */
+    if (!desktop_app_info->get_show_in("wayfire")){
+        add_category_app("Hidden", desktop_app_info);
+        return;
+    }
+    add_category_app("All", desktop_app_info);
+
+    /* Split the Categories, iterate to place into submenus */
+    std::stringstream categories_stream(desktop_app_info->get_categories());
+    std::string segment;
+
+    while(std::getline(categories_stream, segment, ';'))
+    {
+        add_category_app(segment, desktop_app_info);
+    }
+}
+
+void WayfireMenu::add_category_app(std::string category, Glib::RefPtr<Gio::DesktopAppInfo> app)
+{
+    // Filter for allowed categories
+    bool allowed = false;
+    for (const auto& [key, value]: category_definitions)
+    {
+        if(key == category){
+            allowed = true;
+        }
+    }
+    if (!allowed){
+        return;
+    }
+    items[category].push_back(app);
+}
+
+void WayfireMenu::populate_menu_categories(){
+    // Ensure the category list is empty
+    for (auto child : category_box.get_children())
+    {
+        gtk_widget_destroy(GTK_WIDGET(child->gobj()));
+    }
+    // Iterate allowed categories in order
+    for (auto category: category_order){
+        if (category_definitions.count(category) == 1){
+            if (items[category].size() > 0 ){
+                auto icon_name = category_definitions[category]->get_icon_name();
+                auto name = category_definitions[category]->get_name();
+                auto category_button = new WfMenuCategoryButton(this, category, name, icon_name);
+                category_box.pack_start(*category_button);
+            }
+        } else {
+            std::cerr << "Category in order without Category Definition : " << category << std::endl;
+        }
+    }
+    category_box.show_all();
+}
+
+void WayfireMenu::populate_menu_items(std::string category)
+{
+    // Ensure the flowbox is empty
+    for (auto child : flowbox.get_children())
+    {
+        gtk_widget_destroy(GTK_WIDGET(child->gobj()));
+    }
+    for (auto app_info: items[category]){
+        auto app = new WfMenuMenuItem(this, app_info);
+        flowbox.add(*app);
+    }
+    flowbox.show_all();
 }
 
 static bool ends_with(std::string text, std::string pattern)
@@ -205,6 +310,19 @@ void WayfireMenu::load_menu_items_all()
 
 void WayfireMenu::on_search_changed()
 {
+    auto value = search_box.get_text();
+    if(value.length() == 0){
+        /* Text has been unset, show categories again */
+        populate_menu_items(category);
+        category_scrolled_window.show();
+        app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+    }else{
+        /* User is filtering, hide categories, ignore chosen category */
+        populate_menu_items("All");
+        category_scrolled_window.hide();
+        app_scrolled_window.set_min_content_width(int(menu_min_content_width) + int(menu_min_category_width));
+    }
+
     fuzzy_filter  = false;
     count_matches = 0;
     flowbox.invalidate_filter();
@@ -246,6 +364,7 @@ bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 
 void WayfireMenu::on_popover_shown()
 {
+    search_box.set_text("");
     flowbox.unselect_all();
 }
 
@@ -297,9 +416,17 @@ void WayfireMenu::update_popover_layout()
         flowbox_container.add(bottom_pad);
         flowbox_container.add(flowbox);
 
-        scrolled_window.set_min_content_width(int(menu_min_content_width));
-        scrolled_window.set_min_content_height(int(menu_min_content_height));
-        scrolled_window.add(flowbox_container);
+        scroll_pair.add(category_scrolled_window);
+        scroll_pair.add(app_scrolled_window);
+        scroll_pair.set_homogeneous(false);
+
+        app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+        app_scrolled_window.set_min_content_height(int(menu_min_content_height));
+        app_scrolled_window.add(flowbox_container);
+
+        category_scrolled_window.set_min_content_width(int(menu_min_category_width));
+        category_scrolled_window.set_min_content_height(int(menu_min_content_height));
+        category_scrolled_window.add(category_box);
 
         search_box.property_margin().set_value(20);
         search_box.set_icon_from_icon_name("search", Gtk::ENTRY_ICON_SECONDARY);
@@ -310,16 +437,16 @@ void WayfireMenu::update_popover_layout()
         /* Layout was already initialized, make sure to remove widgets before
          * adding them again */
         popover_layout_box.remove(search_box);
-        popover_layout_box.remove(scrolled_window);
+        popover_layout_box.remove(scroll_pair);
     }
 
     if ((std::string)panel_position == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.pack_start(search_box);
-        popover_layout_box.pack_start(scrolled_window);
+        popover_layout_box.pack_start(scroll_pair);
     } else
     {
-        popover_layout_box.pack_start(scrolled_window);
+        popover_layout_box.pack_start(scroll_pair);
         popover_layout_box.pack_start(search_box);
     }
 
@@ -482,6 +609,8 @@ void WayfireMenu::refresh()
     }
 
     load_menu_items_all();
+    populate_menu_categories();
+    populate_menu_items("All");
     flowbox.show_all();
 }
 
@@ -494,6 +623,24 @@ static void app_info_changed(GAppInfoMonitor *gappinfomonitor, gpointer user_dat
 
 void WayfireMenu::init(Gtk::HBox *container)
 {
+
+    /* https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
+     * Using the 'Main' categories, with names and icons assigned
+     * Any Categories in .desktop files that are not in this list are ignored */
+    category_definitions["All"] = std::make_unique<WfMenuCategoryDefinition>("All", "applications-other");
+    category_definitions["Network"] = std::make_unique<WfMenuCategoryDefinition>("Internet", "applications-internet");
+    category_definitions["Education"] = std::make_unique<WfMenuCategoryDefinition>("Education", "applications-education");
+    category_definitions["Office"] = std::make_unique<WfMenuCategoryDefinition>("Office", "applications-office");
+    category_definitions["Development"] = std::make_unique<WfMenuCategoryDefinition>("Development", "applications-development");
+    category_definitions["Graphics"] = std::make_unique<WfMenuCategoryDefinition>("Graphics", "applications-graphics");
+    category_definitions["AudioVideo"] = std::make_unique<WfMenuCategoryDefinition>("Multimedia", "applications-multimedia");
+    category_definitions["Game"] = std::make_unique<WfMenuCategoryDefinition>("Games", "applications-games");
+    category_definitions["Science"] = std::make_unique<WfMenuCategoryDefinition>("Science", "applications-science");
+    category_definitions["Settings"] = std::make_unique<WfMenuCategoryDefinition>("Settings", "preferences-desktop");
+    category_definitions["System"] = std::make_unique<WfMenuCategoryDefinition>("System", "applications-system");
+    category_definitions["Utility"] = std::make_unique<WfMenuCategoryDefinition>("Accessories", "applications-utilities");
+    category_definitions["Hidden"] = std::make_unique<WfMenuCategoryDefinition>("Other Desktops", "user-desktop");
+
     output->toggle_menu_signal().connect(sigc::mem_fun(this, &WayfireMenu::toggle_menu));
 
     menu_icon.set_callback([=] () { update_icon(); });
@@ -530,6 +677,8 @@ void WayfireMenu::init(Gtk::HBox *container)
 
     load_menu_items_all();
     update_popover_layout();
+    populate_menu_categories();
+    populate_menu_items("All");
 
     app_info_monitor_changed_handler_id =
         g_signal_connect(app_info_monitor, "changed", G_CALLBACK(app_info_changed), this);
@@ -554,3 +703,9 @@ void WayfireMenu::hide_menu()
 {
     button->set_active(false);
 }
+
+void WayfireMenu::set_category(std::string in_category)
+{
+    category = in_category;
+    populate_menu_items(in_category);
+}
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index c881e6fa..89e7e716 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -15,6 +15,35 @@
 class WayfireMenu;
 using AppInfo = Glib::RefPtr<Gio::AppInfo>;
 
+class WfMenuCategoryDefinition 
+{
+  public:
+    WfMenuCategoryDefinition(std::string name, std::string icon_name);
+    std::string get_name();
+    std::string get_icon_name();
+
+  private:
+    std::string name;
+    std::string icon_name;
+};
+
+class WfMenuCategoryButton : public Gtk::Button
+{
+  public:
+    WfMenuCategoryButton(WayfireMenu *menu, std::string category, std::string label, std::string icon_name);
+
+  private:
+    WayfireMenu *menu;
+    Gtk::HBox  m_box;
+    Gtk::Label m_label;
+    Gtk::Image m_image;
+
+    std::string category;
+    std::string label;
+    std::string icon_name;
+    void on_click();
+};
+
 class WfMenuMenuItem : public Gtk::HBox
 {
   public:
@@ -82,15 +111,16 @@ class WayfireMenu : public WayfireWidget
     WayfireOutput *output;
 
     Gtk::Box flowbox_container;
-    Gtk::HBox hbox, hbox_bottom;
+    Gtk::HBox hbox, hbox_bottom, scroll_pair;
     Gtk::VBox bottom_pad;
     Gtk::VBox popover_layout_box;
+    Gtk::VBox category_box;
     Gtk::Separator separator;
     Gtk::Image main_image;
     Gtk::Entry search_box;
     Gtk::FlowBox flowbox;
     Gtk::Button logout_button;
-    Gtk::ScrolledWindow scrolled_window;
+    Gtk::ScrolledWindow app_scrolled_window, category_scrolled_window;
     std::unique_ptr<WayfireMenuButton> button;
     std::unique_ptr<WayfireLogoutUI> logout_ui;
 
@@ -101,6 +131,8 @@ class WayfireMenu : public WayfireWidget
     void load_menu_items_from_dir(std::string directory);
     void load_menu_items_all();
 
+    void add_category_app(std::string category, Glib::RefPtr<Gio::DesktopAppInfo>);
+
     bool update_icon();
 
     bool fuzzy_filter     = false;
@@ -111,16 +143,22 @@ class WayfireMenu : public WayfireWidget
     void on_search_changed();
     void on_popover_shown();
 
-    std::vector<std::unique_ptr<WfMenuMenuItem>> items;
     /* loaded_apps is a list of the already-opened applications + their execs,
      * so that we don't show duplicate entries */
     std::set<std::pair<std::string, std::string>> loaded_apps;
+    std::unordered_map<std::string, std::vector<Glib::RefPtr<Gio::DesktopAppInfo>>> items;
+    std::unordered_map<std::string, std::unique_ptr<WfMenuCategoryDefinition>> category_definitions;
+    std::string category="All";
+    std::vector<std::string> category_order = {
+      "All", "Network", "Education", "Office", "Development", "Graphics", "AudioVideo", "Game", "Science", "Settings", "System", "Utility", "Hidden"
+    };
 
     WfOption<std::string> menu_logout_command{"panel/menu_logout_command"};
     WfOption<bool> fuzzy_search_enabled{"panel/menu_fuzzy_search"};
     WfOption<std::string> panel_position{"panel/position"};
     WfOption<std::string> menu_icon{"panel/menu_icon"};
     WfOption<int> menu_size{"panel/launchers_size"};
+    WfOption<int> menu_min_category_width{"panel/menu_min_category_width"};
     WfOption<int> menu_min_content_width{"panel/menu_min_content_width"};
     WfOption<int> menu_min_content_height{"panel/menu_min_content_height"};
     void update_popover_layout();
@@ -129,9 +167,12 @@ class WayfireMenu : public WayfireWidget
 
   public:
     void init(Gtk::HBox *container) override;
+    void populate_menu_items(std::string category);
+    void populate_menu_categories();
     void toggle_menu();
     void hide_menu();
     void refresh();
+    void set_category(std::string category);
     WayfireMenu(WayfireOutput *output)
     {
         this->output = output;

From 9a9ee1588311f339cdbf653c5f13ddc574dc9945 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 15:33:12 +0100
Subject: [PATCH 04/14] menu: Add DesktopEntry actions menu menu: Catch and
 inject typing on popover menu: Always select first item in menu when typing
 in search menu: Always reset to "All" Category on open menu: Add optional
 list view menu: Use gtk ellipsize to shorten labels

---
 metadata/panel.xml         |   8 ++
 src/panel/widgets/menu.cpp | 210 ++++++++++++++++++++++++++++++-------
 src/panel/widgets/menu.hpp |  28 +++--
 3 files changed, 204 insertions(+), 42 deletions(-)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index 5d950bb7..402b4fce 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -199,6 +199,14 @@
 		<min>100</min>
 		<max>5000</max>
 	</option>
+	<option name="menu_list" type="bool">
+		<_short>Show Menu Applications as a List</_short>
+		<default>false</default>
+	</option>
+	<option name="menu_show_categories" type="bool">
+		<_short>Show Application Categories</_short>
+		<default>false</default>
+	</option>
 	<option name="menu_logout_command" type="string">
 		<_short>Menu Logout Command</_short>
 		<_long>If not specified, a default logout interface will be used.</_long>
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 115a449f..92f90751 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -24,11 +24,13 @@ WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::strin
 
 }
 
-std::string WfMenuCategoryDefinition::get_name(){
+std::string WfMenuCategoryDefinition::get_name()
+{
     return name;
 }
 
-std::string WfMenuCategoryDefinition::get_icon_name(){
+std::string WfMenuCategoryDefinition::get_icon_name()
+{
     return icon_name;
 }
 
@@ -57,37 +59,100 @@ void WfMenuCategoryButton::on_click()
     menu->set_category(category);
 }
 
-WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, AppInfo app) :
-    Gtk::HBox(), menu(_menu), m_app_info(app)
+WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
+    Gtk::FlowBoxChild(), menu(_menu), m_app_info(app)
 {
     m_image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon(),
         (Gtk::IconSize)Gtk::ICON_SIZE_LARGE_TOOLBAR);
     m_image.set_pixel_size(48);
+    m_label.set_text(app->get_name());
+    auto event_box = new Gtk::EventBox();
 
-    Glib::ustring name = app->get_name();
+    m_has_actions = app->list_actions().size() > 0;
 
-    if (name.length() > MAX_LAUNCHER_NAME_LENGTH)
+    if (menu->menu_list)
     {
-        name = name.substr(0, MAX_LAUNCHER_NAME_LENGTH - 2) + "..";
+        this->set_size_request(menu->menu_min_content_width, 48);
+        m_list_box.pack_start(m_image, false, false);
+        m_list_box.pack_start(m_label, true, true);
+        m_label.set_xalign(0.0);
+        event_box->add(m_list_box);
+        m_padding_box.pack_start(*event_box);
+
+        if (m_has_actions)
+        {
+            auto action_button = new Gtk::Button();
+            action_button->set_image_from_icon_name("pan-end");
+            action_button->get_style_context()->add_class("flat");
+            m_padding_box.pack_start(*action_button, false, false);
+
+            action_button->signal_clicked().connect(
+                [this] () {
+                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
+                }
+            );
+        }
+    } else
+    {
+        m_label.set_max_width_chars(MAX_LAUNCHER_NAME_LENGTH);
+        m_label.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+        m_button_box.pack_start(m_image, false, false);
+        m_button_box.pack_end(m_label, false, false);
+
+        event_box->add(m_button_box);
+
+        /* Wrap the button box into a HBox, with left/right padding.
+         * This way, the button doesn't fill the whole area allocated for an entry
+         * in the flowbox */
+        m_padding_box.pack_start(m_left_pad);
+        m_padding_box.pack_start(*event_box);
+        m_padding_box.pack_start(m_right_pad);
     }
 
-    m_label.set_text(name);
-    m_button_box.pack_start(m_image, false, false);
-    m_button_box.pack_end(m_label, false, false);
-
-    m_button.add(m_button_box);
-    m_button.get_style_context()->add_class("flat");
-
-    /* Wrap the button box into a HBox, with left/right padding.
-     * This way, the button doesn't fill the whole area allocated for an entry
-     * in the flowbox */
-    this->pack_start(m_left_pad);
-    this->pack_start(m_button);
-    this->pack_start(m_right_pad);
+    for(auto action : app->list_actions())
+    {
+        auto menu_item = new Gtk::MenuItem();
+        menu_item->set_label(m_app_info->get_action_name(action));
+        menu_item->show();
+        menu_item->signal_activate().connect(
+            [this, action] () {
+                m_app_info->launch_action(action);
+                menu->hide_menu();
+            }
+        );
+        m_action_menu.append(*menu_item);
+    }
+    add(m_padding_box);
+    /* Can accept Enter/Return from search_box */
+    set_can_default(true);
 
-    get_style_context()->add_class("flat");
-    m_button.signal_clicked().connect_notify(
+    /* Called when activated by Enter/Return */
+    this->signal_activate().connect_notify(
         sigc::mem_fun(this, &WfMenuMenuItem::on_click));
+    /* Click doesn't automatically result in activate, here we get it ourselves
+     * Doubles up as a right-click catcher for action menu popup */
+    event_box->signal_button_release_event().connect(
+        [this] (GdkEventButton *ev) -> bool
+        {
+            if (ev->button == GDK_BUTTON_PRIMARY && ev->type == GDK_BUTTON_RELEASE)
+            {
+                on_click();
+            }
+            if (m_has_actions && ev->button == GDK_BUTTON_SECONDARY && ev->type == GDK_BUTTON_RELEASE)
+            {
+                if(menu->menu_list)
+                {
+                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
+                } else
+                {
+                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_SOUTH, Gdk::GRAVITY_NORTH, NULL);
+                }
+                return true;
+            }
+            return false;
+        }
+    );
+
 }
 
 void WfMenuMenuItem::on_click()
@@ -311,33 +376,42 @@ void WayfireMenu::load_menu_items_all()
 void WayfireMenu::on_search_changed()
 {
     auto value = search_box.get_text();
-    if(value.length() == 0){
-        /* Text has been unset, show categories again */
-        populate_menu_items(category);
-        category_scrolled_window.show();
-        app_scrolled_window.set_min_content_width(int(menu_min_content_width));
-    }else{
-        /* User is filtering, hide categories, ignore chosen category */
-        populate_menu_items("All");
-        category_scrolled_window.hide();
-        app_scrolled_window.set_min_content_width(int(menu_min_content_width) + int(menu_min_category_width));
+    if(menu_show_categories)
+    {
+        if(value.length() == 0)
+        {
+            /* Text has been unset, show categories again */
+            populate_menu_items(category);
+            category_scrolled_window.show();
+            app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+        } else
+        {
+            /* User is filtering, hide categories, ignore chosen category */
+            populate_menu_items("All");
+            category_scrolled_window.hide();
+            app_scrolled_window.set_min_content_width(int(menu_min_content_width) + int(menu_min_category_width));
+        }
     }
 
     fuzzy_filter  = false;
     count_matches = 0;
+    flowbox.unselect_all();
     flowbox.invalidate_filter();
 
     /* We got no matches, try to fuzzy-match */
     if ((count_matches <= 0) && fuzzy_search_enabled)
     {
         fuzzy_filter = true;
+        flowbox.unselect_all();
         flowbox.invalidate_filter();
     }
+
+    select_first_flowbox_item();
 }
 
 bool WayfireMenu::on_filter(Gtk::FlowBoxChild *child)
 {
-    auto button = dynamic_cast<WfMenuMenuItem*>(child->get_child());
+    auto button = dynamic_cast<WfMenuMenuItem*>(child);
     assert(button);
 
     auto text = search_box.get_text();
@@ -355,8 +429,8 @@ bool WayfireMenu::on_filter(Gtk::FlowBoxChild *child)
 
 bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 {
-    auto b1 = dynamic_cast<WfMenuMenuItem*>(a->get_child());
-    auto b2 = dynamic_cast<WfMenuMenuItem*>(b->get_child());
+    auto b1 = dynamic_cast<WfMenuMenuItem*>(a);
+    auto b2 = dynamic_cast<WfMenuMenuItem*>(b);
     assert(b1 && b2);
 
     return *b2 < *b1;
@@ -365,6 +439,7 @@ bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 void WayfireMenu::on_popover_shown()
 {
     search_box.set_text("");
+    set_category("All");
     flowbox.unselect_all();
 }
 
@@ -408,6 +483,8 @@ void WayfireMenu::update_popover_layout()
     {
         button->get_popover()->add(popover_layout_box);
 
+        flowbox.set_selection_mode(Gtk::SelectionMode::SELECTION_SINGLE);
+        flowbox.set_activate_on_single_click(true);
         flowbox.set_valign(Gtk::ALIGN_START);
         flowbox.set_homogeneous(true);
         flowbox.set_sort_func(sigc::mem_fun(this, &WayfireMenu::on_sort));
@@ -428,8 +505,16 @@ void WayfireMenu::update_popover_layout()
         category_scrolled_window.set_min_content_height(int(menu_min_content_height));
         category_scrolled_window.add(category_box);
 
+
+        search_box.set_can_default(false);
+        search_box.set_activates_default(true);
         search_box.property_margin().set_value(20);
         search_box.set_icon_from_icon_name("search", Gtk::ENTRY_ICON_SECONDARY);
+
+        /* Cursor moved in flowbox */
+        flowbox.signal_selected_children_changed().connect_notify(
+            sigc::mem_fun(this, &WayfireMenu::set_default_to_selection));
+        /* Search value changed */
         search_box.signal_changed().connect_notify(
             sigc::mem_fun(this, &WayfireMenu::on_search_changed));
     } else
@@ -450,8 +535,12 @@ void WayfireMenu::update_popover_layout()
         popover_layout_box.pack_start(search_box);
     }
 
-    popover_layout_box.set_focus_chain({&search_box});
     popover_layout_box.show_all();
+
+    if (!menu_show_categories)
+    {
+        category_scrolled_window.hide();
+    }
 }
 
 void WayfireLogoutUI::on_logout_click()
@@ -646,6 +735,8 @@ void WayfireMenu::init(Gtk::HBox *container)
     menu_icon.set_callback([=] () { update_icon(); });
     menu_size.set_callback([=] () { update_icon(); });
     panel_position.set_callback([=] () { update_popover_layout(); });
+    menu_show_categories.set_callback([=] () { update_popover_layout(); });
+    menu_list.set_callback([=] () { update_popover_layout(); });
 
     button = std::make_unique<WayfireMenuButton>("panel");
     button->add(main_image);
@@ -680,6 +771,22 @@ void WayfireMenu::init(Gtk::HBox *container)
     populate_menu_categories();
     populate_menu_items("All");
 
+    /* Catch keypresses on menu popover, forward to Entry */
+    button->get_popover()->signal_key_press_event().connect(
+        [this] (GdkEventKey *ev) -> bool
+        {
+            /* It has string value, send it to searchbox 
+             * This quickly filters navigation keys out*/
+            std::string input = ev->string;
+            if (input.length() > 0)
+            {
+                return this->search_box.inject(ev);
+            }
+            /* Continue with normal event processing */
+            return false;
+        }
+    );
+
     app_info_monitor_changed_handler_id =
         g_signal_connect(app_info_monitor, "changed", G_CALLBACK(app_info_changed), this);
 
@@ -709,3 +816,34 @@ void WayfireMenu::set_category(std::string in_category)
     category = in_category;
     populate_menu_items(in_category);
 }
+
+void WayfireMenu::set_default_to_selection()
+{
+    auto children = flowbox.get_selected_children();
+    if (children.size() == 1)
+    {
+            children[0]->grab_default();
+            children[0]->grab_focus();
+    }
+}
+
+void WayfireMenu::select_first_flowbox_item()
+{
+    for (auto child : flowbox.get_children())
+    {
+        if (child->get_mapped())
+        {
+            Gtk::FlowBoxChild* cast_child = dynamic_cast<Gtk::FlowBoxChild*>(child);
+            if (cast_child)
+            {
+                flowbox.select_child(*cast_child);
+                return;
+            }
+        }
+    }
+}
+
+bool WayfireMenuInjectionEntry::inject(GdkEventKey *ev)
+{
+    return on_key_press_event(ev);
+}
\ No newline at end of file
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 89e7e716..5585d554 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -44,10 +44,10 @@ class WfMenuCategoryButton : public Gtk::Button
     void on_click();
 };
 
-class WfMenuMenuItem : public Gtk::HBox
+class WfMenuMenuItem : public Gtk::FlowBoxChild
 {
   public:
-    WfMenuMenuItem(WayfireMenu *menu, AppInfo app);
+    WfMenuMenuItem(WayfireMenu *menu, Glib::RefPtr<Gio::DesktopAppInfo> app);
 
     bool matches(Glib::ustring text);
     bool fuzzy_match(Glib::ustring text);
@@ -56,12 +56,16 @@ class WfMenuMenuItem : public Gtk::HBox
   private:
     WayfireMenu *menu;
     Gtk::Box m_left_pad, m_right_pad;
-    Gtk::Button m_button;
+    Gtk::HBox m_padding_box;
     Gtk::VBox m_button_box;
+    Gtk::HBox m_list_box;
     Gtk::Image m_image;
     Gtk::Label m_label;
+    Gtk::Menu m_action_menu;
 
-    AppInfo m_app_info;
+    bool m_has_actions = false;
+
+    Glib::RefPtr<Gio::DesktopAppInfo> m_app_info;
     void on_click();
 };
 
@@ -106,6 +110,12 @@ class WayfireLogoutUI
     void on_cancel_click();
 };
 
+class WayfireMenuInjectionEntry: public Gtk::Entry
+{
+  public:
+  bool inject(GdkEventKey *ev);
+};
+
 class WayfireMenu : public WayfireWidget
 {
     WayfireOutput *output;
@@ -117,7 +127,7 @@ class WayfireMenu : public WayfireWidget
     Gtk::VBox category_box;
     Gtk::Separator separator;
     Gtk::Image main_image;
-    Gtk::Entry search_box;
+    WayfireMenuInjectionEntry search_box;
     Gtk::FlowBox flowbox;
     Gtk::Button logout_button;
     Gtk::ScrolledWindow app_scrolled_window, category_scrolled_window;
@@ -159,11 +169,14 @@ class WayfireMenu : public WayfireWidget
     WfOption<std::string> menu_icon{"panel/menu_icon"};
     WfOption<int> menu_size{"panel/launchers_size"};
     WfOption<int> menu_min_category_width{"panel/menu_min_category_width"};
-    WfOption<int> menu_min_content_width{"panel/menu_min_content_width"};
     WfOption<int> menu_min_content_height{"panel/menu_min_content_height"};
+    WfOption<bool> menu_show_categories{"panel/menu_show_categories"};
     void update_popover_layout();
     void create_logout_ui();
     void on_logout_click();
+    void key_press_search();
+    void select_first_flowbox_item();
+    void set_default_to_selection();
 
   public:
     void init(Gtk::HBox *container) override;
@@ -173,6 +186,9 @@ class WayfireMenu : public WayfireWidget
     void hide_menu();
     void refresh();
     void set_category(std::string category);
+    WfOption<bool> menu_list{"panel/menu_list"};
+    WfOption<int> menu_min_content_width{"panel/menu_min_content_width"};
+
     WayfireMenu(WayfireOutput *output)
     {
         this->output = output;

From 8166de19281f692d139db146f01722ac5a540f5b Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 16:24:34 +0100
Subject: [PATCH 05/14] Revert "- Moved theme value after first potential
 return"

This reverts commit 0e2334efb189b983b51f695207ffff1364e74ec9.
---
 src/panel/widgets/launchers.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/panel/widgets/launchers.cpp b/src/panel/widgets/launchers.cpp
index 63063f3d..7d8574e3 100644
--- a/src/panel/widgets/launchers.cpp
+++ b/src/panel/widgets/launchers.cpp
@@ -34,15 +34,14 @@ struct DesktopLauncherInfo : public LauncherInfo
 
     Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(int32_t size)
     {
-        auto icon = app_info->get_icon()->to_string();
+        auto icon                 = app_info->get_icon()->to_string();
+        auto theme                = Gtk::IconTheme::get_default();
         std::string absolute_path = "/";
-        if (!icon.compare(0, absolute_path.size(), absolute_path))
+        if (!icon.compare(0, absolute_path.size(), absolute_path)) 
         {
             return Gdk::Pixbuf::create_from_file(icon, size, size);
         }
 
-        auto theme = Gtk::IconTheme::get_default();
-
         if (!theme->lookup_icon(icon, size))
         {
             std::cerr << "Failed to load icon \"" << icon << "\"" << std::endl;

From d51de00cc41f0c885b12119e3dc9b7243e57ff47 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 16:24:51 +0100
Subject: [PATCH 06/14] Revert "- Check for and load absolute path icons"

This reverts commit 21cae62c4c7040088d4c9808cd338342babfd339.
---
 src/panel/widgets/launchers.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/panel/widgets/launchers.cpp b/src/panel/widgets/launchers.cpp
index 7d8574e3..406787fb 100644
--- a/src/panel/widgets/launchers.cpp
+++ b/src/panel/widgets/launchers.cpp
@@ -34,13 +34,8 @@ struct DesktopLauncherInfo : public LauncherInfo
 
     Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(int32_t size)
     {
-        auto icon                 = app_info->get_icon()->to_string();
-        auto theme                = Gtk::IconTheme::get_default();
-        std::string absolute_path = "/";
-        if (!icon.compare(0, absolute_path.size(), absolute_path)) 
-        {
-            return Gdk::Pixbuf::create_from_file(icon, size, size);
-        }
+        auto icon  = app_info->get_icon()->to_string();
+        auto theme = Gtk::IconTheme::get_default();
 
         if (!theme->lookup_icon(icon, size))
         {

From 5409ff1f57622c7c100942de905bc2b6afd75798 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 17:38:02 +0100
Subject: [PATCH 07/14] - Added example config

---
 wf-shell.ini.example | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/wf-shell.ini.example b/wf-shell.ini.example
index 21202ad6..042cb665 100644
--- a/wf-shell.ini.example
+++ b/wf-shell.ini.example
@@ -99,11 +99,20 @@ network_icon_invert_color = 1
 # whether to colour the wifi signal strength
 network_status_use_color = yes
 
+# Show a list of application categories in menu
+menu_show_categories = false
+
+# Show application icons in a list view
+# false shows them as a grid
+menu_list = false
 
 # Configuration for the menu widget
 # whether to enable fuzzy search in the menu
 menu_fuzzy_search = 1
 
+# Minimum width for category list. Shares height with content Below
+menu_min_category_width = 200
+
 # Minimum width and height for the contents of the menu.
 # Can be useful for small screens and/or high DPI scaling.
 menu_min_content_width = 500

From 94b7b37861c51a8b1ea4c2918b1a515cbbdb0c96 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 18:18:24 +0100
Subject: [PATCH 08/14] - uncrustify 1

---
 src/panel/widgets/menu.cpp | 171 +++++++++++++++++++++----------------
 src/panel/widgets/menu.hpp |  13 +--
 2 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 92f90751..233ceaa1 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -20,9 +20,7 @@ const std::string default_icon = ICONDIR "/wayfire.png";
 
 WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::string _icon_name):
     name(_name), icon_name(_icon_name)
-{
-
-}
+{}
 
 std::string WfMenuCategoryDefinition::get_name()
 {
@@ -34,7 +32,8 @@ std::string WfMenuCategoryDefinition::get_icon_name()
     return icon_name;
 }
 
-WfMenuCategoryButton::WfMenuCategoryButton(WayfireMenu *_menu, std::string _category, std::string _label, std::string _icon_name) :
+WfMenuCategoryButton::WfMenuCategoryButton(WayfireMenu *_menu, std::string _category, std::string _label,
+    std::string _icon_name) :
     Gtk::Button(), menu(_menu), category(_category), label(_label), icon_name(_icon_name)
 {
     m_image.set_from_icon_name(icon_name,
@@ -87,10 +86,10 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
             m_padding_box.pack_start(*action_button, false, false);
 
             action_button->signal_clicked().connect(
-                [this] () {
-                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
-                }
-            );
+                [this] ()
+            {
+                m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
+            });
         }
     } else
     {
@@ -109,19 +108,20 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         m_padding_box.pack_start(m_right_pad);
     }
 
-    for(auto action : app->list_actions())
+    for (auto action : app->list_actions())
     {
         auto menu_item = new Gtk::MenuItem();
         menu_item->set_label(m_app_info->get_action_name(action));
         menu_item->show();
         menu_item->signal_activate().connect(
-            [this, action] () {
-                m_app_info->launch_action(action);
-                menu->hide_menu();
-            }
-        );
+            [this, action] () 
+        {
+            m_app_info->launch_action(action);
+            menu->hide_menu();
+        });
         m_action_menu.append(*menu_item);
     }
+
     add(m_padding_box);
     /* Can accept Enter/Return from search_box */
     set_can_default(true);
@@ -133,25 +133,25 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
      * Doubles up as a right-click catcher for action menu popup */
     event_box->signal_button_release_event().connect(
         [this] (GdkEventButton *ev) -> bool
+    {
+        if (ev->button == GDK_BUTTON_PRIMARY && ev->type == GDK_BUTTON_RELEASE)
+        {
+            on_click();
+        }
+        if (m_has_actions && ev->button == GDK_BUTTON_SECONDARY && ev->type == GDK_BUTTON_RELEASE)
         {
-            if (ev->button == GDK_BUTTON_PRIMARY && ev->type == GDK_BUTTON_RELEASE)
+            if(menu->menu_list)
             {
-                on_click();
-            }
-            if (m_has_actions && ev->button == GDK_BUTTON_SECONDARY && ev->type == GDK_BUTTON_RELEASE)
+                m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
+            } else
             {
-                if(menu->menu_list)
-                {
-                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
-                } else
-                {
-                    m_action_menu.popup_at_widget(this, Gdk::GRAVITY_SOUTH, Gdk::GRAVITY_NORTH, NULL);
-                }
-                return true;
+                m_action_menu.popup_at_widget(this, Gdk::GRAVITY_SOUTH, Gdk::GRAVITY_NORTH, NULL);
             }
-            return false;
+            return true;
         }
-    );
+
+        return false;
+    });
 
 }
 
@@ -253,19 +253,21 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 
     loaded_apps.insert({name, exec});
 
-    /* Check if this has a 'OnlyShownIn' for a different desktop env 
-       If so, we throw it in a pile at the bottom just to be safe */
-    if (!desktop_app_info->get_show_in("wayfire")){
+    /* Check if this has a 'OnlyShownIn' for a different desktop env
+     *  If so, we throw it in a pile at the bottom just to be safe */
+    if (!desktop_app_info->get_show_in("wayfire"))
+    {
         add_category_app("Hidden", desktop_app_info);
         return;
     }
+
     add_category_app("All", desktop_app_info);
 
     /* Split the Categories, iterate to place into submenus */
     std::stringstream categories_stream(desktop_app_info->get_categories());
     std::string segment;
 
-    while(std::getline(categories_stream, segment, ';'))
+    while (std::getline(categories_stream, segment, ';'))
     {
         add_category_app(segment, desktop_app_info);
     }
@@ -275,37 +277,47 @@ void WayfireMenu::add_category_app(std::string category, Glib::RefPtr<Gio::Deskt
 {
     // Filter for allowed categories
     bool allowed = false;
-    for (const auto& [key, value]: category_definitions)
+    for (const auto& [key, value] : category_definitions)
     {
-        if(key == category){
+        if (key == category)
+        {
             allowed = true;
         }
     }
-    if (!allowed){
+    if (!allowed)
+    {
         return;
     }
+
     items[category].push_back(app);
 }
 
-void WayfireMenu::populate_menu_categories(){
+void WayfireMenu::populate_menu_categories()
+{
     // Ensure the category list is empty
     for (auto child : category_box.get_children())
     {
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
     }
+
     // Iterate allowed categories in order
-    for (auto category: category_order){
-        if (category_definitions.count(category) == 1){
-            if (items[category].size() > 0 ){
+    for (auto category: category_order)
+    {
+        if (category_definitions.count(category) == 1)
+        {
+            if (items[category].size() > 0 )
+            {
                 auto icon_name = category_definitions[category]->get_icon_name();
                 auto name = category_definitions[category]->get_name();
                 auto category_button = new WfMenuCategoryButton(this, category, name, icon_name);
                 category_box.pack_start(*category_button);
             }
-        } else {
+        } else
+        {
             std::cerr << "Category in order without Category Definition : " << category << std::endl;
         }
     }
+
     category_box.show_all();
 }
 
@@ -316,10 +328,13 @@ void WayfireMenu::populate_menu_items(std::string category)
     {
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
     }
-    for (auto app_info: items[category]){
+
+    for (auto app_info : items[category])
+    {
         auto app = new WfMenuMenuItem(this, app_info);
         flowbox.add(*app);
     }
+
     flowbox.show_all();
 }
 
@@ -376,9 +391,9 @@ void WayfireMenu::load_menu_items_all()
 void WayfireMenu::on_search_changed()
 {
     auto value = search_box.get_text();
-    if(menu_show_categories)
+    if (menu_show_categories)
     {
-        if(value.length() == 0)
+        if (value.length() == 0)
         {
             /* Text has been unset, show categories again */
             populate_menu_items(category);
@@ -389,7 +404,8 @@ void WayfireMenu::on_search_changed()
             /* User is filtering, hide categories, ignore chosen category */
             populate_menu_items("All");
             category_scrolled_window.hide();
-            app_scrolled_window.set_min_content_width(int(menu_min_content_width) + int(menu_min_category_width));
+            app_scrolled_window.set_min_content_width(int(menu_min_content_width) +
+                int(menu_min_category_width));
         }
     }
 
@@ -505,7 +521,6 @@ void WayfireMenu::update_popover_layout()
         category_scrolled_window.set_min_content_height(int(menu_min_content_height));
         category_scrolled_window.add(category_box);
 
-
         search_box.set_can_default(false);
         search_box.set_activates_default(true);
         search_box.property_margin().set_value(20);
@@ -712,23 +727,34 @@ static void app_info_changed(GAppInfoMonitor *gappinfomonitor, gpointer user_dat
 
 void WayfireMenu::init(Gtk::HBox *container)
 {
-
     /* https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
      * Using the 'Main' categories, with names and icons assigned
      * Any Categories in .desktop files that are not in this list are ignored */
-    category_definitions["All"] = std::make_unique<WfMenuCategoryDefinition>("All", "applications-other");
-    category_definitions["Network"] = std::make_unique<WfMenuCategoryDefinition>("Internet", "applications-internet");
-    category_definitions["Education"] = std::make_unique<WfMenuCategoryDefinition>("Education", "applications-education");
-    category_definitions["Office"] = std::make_unique<WfMenuCategoryDefinition>("Office", "applications-office");
-    category_definitions["Development"] = std::make_unique<WfMenuCategoryDefinition>("Development", "applications-development");
-    category_definitions["Graphics"] = std::make_unique<WfMenuCategoryDefinition>("Graphics", "applications-graphics");
-    category_definitions["AudioVideo"] = std::make_unique<WfMenuCategoryDefinition>("Multimedia", "applications-multimedia");
-    category_definitions["Game"] = std::make_unique<WfMenuCategoryDefinition>("Games", "applications-games");
-    category_definitions["Science"] = std::make_unique<WfMenuCategoryDefinition>("Science", "applications-science");
-    category_definitions["Settings"] = std::make_unique<WfMenuCategoryDefinition>("Settings", "preferences-desktop");
-    category_definitions["System"] = std::make_unique<WfMenuCategoryDefinition>("System", "applications-system");
-    category_definitions["Utility"] = std::make_unique<WfMenuCategoryDefinition>("Accessories", "applications-utilities");
-    category_definitions["Hidden"] = std::make_unique<WfMenuCategoryDefinition>("Other Desktops", "user-desktop");
+    category_definitions["All"]     = std::make_unique<WfMenuCategoryDefinition>("All", "applications-other");
+    category_definitions["Network"] = std::make_unique<WfMenuCategoryDefinition>("Internet",
+        "applications-internet");
+    category_definitions["Education"] = std::make_unique<WfMenuCategoryDefinition>("Education",
+        "applications-education");
+    category_definitions["Office"] = std::make_unique<WfMenuCategoryDefinition>("Office",
+        "applications-office");
+    category_definitions["Development"] = std::make_unique<WfMenuCategoryDefinition>("Development",
+        "applications-development");
+    category_definitions["Graphics"] = std::make_unique<WfMenuCategoryDefinition>("Graphics",
+        "applications-graphics");
+    category_definitions["AudioVideo"] = std::make_unique<WfMenuCategoryDefinition>("Multimedia",
+        "applications-multimedia");
+    category_definitions["Game"] = std::make_unique<WfMenuCategoryDefinition>("Games",
+        "applications-games");
+    category_definitions["Science"] = std::make_unique<WfMenuCategoryDefinition>("Science",
+        "applications-science");
+    category_definitions["Settings"] = std::make_unique<WfMenuCategoryDefinition>("Settings",
+        "preferences-desktop");
+    category_definitions["System"] = std::make_unique<WfMenuCategoryDefinition>("System",
+        "applications-system");
+    category_definitions["Utility"] = std::make_unique<WfMenuCategoryDefinition>("Accessories",
+        "applications-utilities");
+    category_definitions["Hidden"] = std::make_unique<WfMenuCategoryDefinition>("Other Desktops",
+        "user-desktop");
 
     output->toggle_menu_signal().connect(sigc::mem_fun(this, &WayfireMenu::toggle_menu));
 
@@ -774,18 +800,17 @@ void WayfireMenu::init(Gtk::HBox *container)
     /* Catch keypresses on menu popover, forward to Entry */
     button->get_popover()->signal_key_press_event().connect(
         [this] (GdkEventKey *ev) -> bool
+    {
+        /* It has string value, send it to searchbox
+         * This quickly filters navigation keys out*/
+        std::string input = ev->string;
+        if (input.length() > 0)
         {
-            /* It has string value, send it to searchbox 
-             * This quickly filters navigation keys out*/
-            std::string input = ev->string;
-            if (input.length() > 0)
-            {
-                return this->search_box.inject(ev);
-            }
-            /* Continue with normal event processing */
-            return false;
+            return this->search_box.inject(ev);
         }
-    );
+        /* Continue with normal event processing */
+        return false;
+    });
 
     app_info_monitor_changed_handler_id =
         g_signal_connect(app_info_monitor, "changed", G_CALLBACK(app_info_changed), this);
@@ -822,8 +847,8 @@ void WayfireMenu::set_default_to_selection()
     auto children = flowbox.get_selected_children();
     if (children.size() == 1)
     {
-            children[0]->grab_default();
-            children[0]->grab_focus();
+        children[0]->grab_default();
+        children[0]->grab_focus();
     }
 }
 
@@ -833,7 +858,7 @@ void WayfireMenu::select_first_flowbox_item()
     {
         if (child->get_mapped())
         {
-            Gtk::FlowBoxChild* cast_child = dynamic_cast<Gtk::FlowBoxChild*>(child);
+            Gtk::FlowBoxChild *cast_child = dynamic_cast<Gtk::FlowBoxChild*>(child);
             if (cast_child)
             {
                 flowbox.select_child(*cast_child);
@@ -846,4 +871,4 @@ void WayfireMenu::select_first_flowbox_item()
 bool WayfireMenuInjectionEntry::inject(GdkEventKey *ev)
 {
     return on_key_press_event(ev);
-}
\ No newline at end of file
+}
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 5585d554..a29e3290 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -15,7 +15,7 @@
 class WayfireMenu;
 using AppInfo = Glib::RefPtr<Gio::AppInfo>;
 
-class WfMenuCategoryDefinition 
+class WfMenuCategoryDefinition
 {
   public:
     WfMenuCategoryDefinition(std::string name, std::string icon_name);
@@ -34,7 +34,7 @@ class WfMenuCategoryButton : public Gtk::Button
 
   private:
     WayfireMenu *menu;
-    Gtk::HBox  m_box;
+    Gtk::HBox m_box;
     Gtk::Label m_label;
     Gtk::Image m_image;
 
@@ -110,10 +110,10 @@ class WayfireLogoutUI
     void on_cancel_click();
 };
 
-class WayfireMenuInjectionEntry: public Gtk::Entry
+class WayfireMenuInjectionEntry : public Gtk::Entry
 {
   public:
-  bool inject(GdkEventKey *ev);
+    bool inject(GdkEventKey *ev);
 };
 
 class WayfireMenu : public WayfireWidget
@@ -158,9 +158,10 @@ class WayfireMenu : public WayfireWidget
     std::set<std::pair<std::string, std::string>> loaded_apps;
     std::unordered_map<std::string, std::vector<Glib::RefPtr<Gio::DesktopAppInfo>>> items;
     std::unordered_map<std::string, std::unique_ptr<WfMenuCategoryDefinition>> category_definitions;
-    std::string category="All";
+    std::string category = "All";
     std::vector<std::string> category_order = {
-      "All", "Network", "Education", "Office", "Development", "Graphics", "AudioVideo", "Game", "Science", "Settings", "System", "Utility", "Hidden"
+        "All", "Network", "Education", "Office", "Development", "Graphics", "AudioVideo", "Game", "Science",
+        "Settings", "System", "Utility", "Hidden"
     };
 
     WfOption<std::string> menu_logout_command{"panel/menu_logout_command"};

From 91941e71a461fba4d904f83c6ca2e2ff36fe3697 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 18:27:37 +0100
Subject: [PATCH 09/14] uncrustify 2

---
 src/panel/widgets/menu.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 233ceaa1..f4b0a4ee 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -114,7 +114,7 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         menu_item->set_label(m_app_info->get_action_name(action));
         menu_item->show();
         menu_item->signal_activate().connect(
-            [this, action] () 
+            [this, action] ()
         {
             m_app_info->launch_action(action);
             menu->hide_menu();
@@ -134,25 +134,25 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
     event_box->signal_button_release_event().connect(
         [this] (GdkEventButton *ev) -> bool
     {
-        if (ev->button == GDK_BUTTON_PRIMARY && ev->type == GDK_BUTTON_RELEASE)
+        if ((ev->button == GDK_BUTTON_PRIMARY) && (ev->type == GDK_BUTTON_RELEASE))
         {
             on_click();
         }
-        if (m_has_actions && ev->button == GDK_BUTTON_SECONDARY && ev->type == GDK_BUTTON_RELEASE)
+        if (m_has_actions && (ev->button == GDK_BUTTON_SECONDARY) && (ev->type == GDK_BUTTON_RELEASE))
         {
-            if(menu->menu_list)
+            if (menu->menu_list)
             {
                 m_action_menu.popup_at_widget(this, Gdk::GRAVITY_NORTH_EAST, Gdk::GRAVITY_NORTH_WEST, NULL);
             } else
             {
                 m_action_menu.popup_at_widget(this, Gdk::GRAVITY_SOUTH, Gdk::GRAVITY_NORTH, NULL);
             }
+
             return true;
         }
 
         return false;
     });
-
 }
 
 void WfMenuMenuItem::on_click()
@@ -254,7 +254,7 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
     loaded_apps.insert({name, exec});
 
     /* Check if this has a 'OnlyShownIn' for a different desktop env
-     *  If so, we throw it in a pile at the bottom just to be safe */
+    *  If so, we throw it in a pile at the bottom just to be safe */
     if (!desktop_app_info->get_show_in("wayfire"))
     {
         add_category_app("Hidden", desktop_app_info);
@@ -284,6 +284,7 @@ void WayfireMenu::add_category_app(std::string category, Glib::RefPtr<Gio::Deskt
             allowed = true;
         }
     }
+
     if (!allowed)
     {
         return;
@@ -301,7 +302,7 @@ void WayfireMenu::populate_menu_categories()
     }
 
     // Iterate allowed categories in order
-    for (auto category: category_order)
+    for (auto category : category_order)
     {
         if (category_definitions.count(category) == 1)
         {
@@ -323,7 +324,7 @@ void WayfireMenu::populate_menu_categories()
 
 void WayfireMenu::populate_menu_items(std::string category)
 {
-    // Ensure the flowbox is empty
+    /* Ensure the flowbox is empty */
     for (auto child : flowbox.get_children())
     {
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
@@ -802,12 +803,13 @@ void WayfireMenu::init(Gtk::HBox *container)
         [this] (GdkEventKey *ev) -> bool
     {
         /* It has string value, send it to searchbox
-         * This quickly filters navigation keys out*/
+        *  This quickly filters navigation keys out*/
         std::string input = ev->string;
         if (input.length() > 0)
         {
             return this->search_box.inject(ev);
         }
+
         /* Continue with normal event processing */
         return false;
     });

From 244706a3e911495ac736031097cb8343e86974da Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Thu, 11 Apr 2024 18:32:45 +0100
Subject: [PATCH 10/14] uncrustify 3

---
 src/panel/widgets/menu.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index f4b0a4ee..9d652b48 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -18,7 +18,7 @@
 #define MAX_LAUNCHER_NAME_LENGTH 11
 const std::string default_icon = ICONDIR "/wayfire.png";
 
-WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::string _icon_name):
+WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::string _icon_name) :
     name(_name), icon_name(_icon_name)
 {}
 
@@ -138,6 +138,7 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         {
             on_click();
         }
+
         if (m_has_actions && (ev->button == GDK_BUTTON_SECONDARY) && (ev->type == GDK_BUTTON_RELEASE))
         {
             if (menu->menu_list)
@@ -306,7 +307,7 @@ void WayfireMenu::populate_menu_categories()
     {
         if (category_definitions.count(category) == 1)
         {
-            if (items[category].size() > 0 )
+            if (items[category].size() > 0)
             {
                 auto icon_name = category_definitions[category]->get_icon_name();
                 auto name = category_definitions[category]->get_name();
@@ -803,7 +804,7 @@ void WayfireMenu::init(Gtk::HBox *container)
         [this] (GdkEventKey *ev) -> bool
     {
         /* It has string value, send it to searchbox
-        *  This quickly filters navigation keys out*/
+         * This quickly filters navigation keys out */
         std::string input = ev->string;
         if (input.length() > 0)
         {

From ec3eccf5e8cc998502fe34f852a9b1964612f5b4 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 12 Apr 2024 17:36:56 +0100
Subject: [PATCH 11/14] - Fix 'other desktop' filter to not assume desktop

---
 src/panel/widgets/menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 9d652b48..03d80048 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -256,7 +256,7 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 
     /* Check if this has a 'OnlyShownIn' for a different desktop env
     *  If so, we throw it in a pile at the bottom just to be safe */
-    if (!desktop_app_info->get_show_in("wayfire"))
+    if (!desktop_app_info->should_show())
     {
         add_category_app("Hidden", desktop_app_info);
         return;

From 4deb30277e829bbe0af6080cda910a5f4b0ce843 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 12 Apr 2024 18:56:47 +0100
Subject: [PATCH 12/14] - Integrate items into category definitions

---
 src/panel/widgets/menu.cpp | 31 ++++++++++++-------------------
 src/panel/widgets/menu.hpp |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 03d80048..5485b5da 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -276,22 +276,11 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 
 void WayfireMenu::add_category_app(std::string category, Glib::RefPtr<Gio::DesktopAppInfo> app)
 {
-    // Filter for allowed categories
-    bool allowed = false;
-    for (const auto& [key, value] : category_definitions)
+    /* Filter for allowed categories */
+    if (category_definitions.count(category) == 1)
     {
-        if (key == category)
-        {
-            allowed = true;
-        }
+        category_definitions[category]->items.push_back(app);
     }
-
-    if (!allowed)
-    {
-        return;
-    }
-
-    items[category].push_back(app);
 }
 
 void WayfireMenu::populate_menu_categories()
@@ -307,10 +296,11 @@ void WayfireMenu::populate_menu_categories()
     {
         if (category_definitions.count(category) == 1)
         {
-            if (items[category].size() > 0)
+            auto& category_definition = category_definitions[category];
+            if (category_definition->items.size() > 0)
             {
-                auto icon_name = category_definitions[category]->get_icon_name();
-                auto name = category_definitions[category]->get_name();
+                auto icon_name = category_definition->get_icon_name();
+                auto name = category_definition->get_name();
                 auto category_button = new WfMenuCategoryButton(this, category, name, icon_name);
                 category_box.pack_start(*category_button);
             }
@@ -331,7 +321,7 @@ void WayfireMenu::populate_menu_items(std::string category)
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
     }
 
-    for (auto app_info : items[category])
+    for (auto app_info : category_definitions[category]->items)
     {
         auto app = new WfMenuMenuItem(this, app_info);
         flowbox.add(*app);
@@ -708,7 +698,10 @@ void WayfireMenu::on_logout_click()
 void WayfireMenu::refresh()
 {
     loaded_apps.clear();
-    items.clear();
+    for (auto& [key, category_definition] : category_definitions)
+    {
+        category_definition->items.clear();
+    }
     for (auto child : flowbox.get_children())
     {
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index a29e3290..6c1e4348 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -21,6 +21,7 @@ class WfMenuCategoryDefinition
     WfMenuCategoryDefinition(std::string name, std::string icon_name);
     std::string get_name();
     std::string get_icon_name();
+    std::vector<Glib::RefPtr<Gio::DesktopAppInfo>> items;
 
   private:
     std::string name;
@@ -156,7 +157,6 @@ class WayfireMenu : public WayfireWidget
     /* loaded_apps is a list of the already-opened applications + their execs,
      * so that we don't show duplicate entries */
     std::set<std::pair<std::string, std::string>> loaded_apps;
-    std::unordered_map<std::string, std::vector<Glib::RefPtr<Gio::DesktopAppInfo>>> items;
     std::unordered_map<std::string, std::unique_ptr<WfMenuCategoryDefinition>> category_definitions;
     std::string category = "All";
     std::vector<std::string> category_order = {

From ce4978debf1471c942f5bb1abdd7a3cdc5cc42b0 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 12 Apr 2024 18:59:07 +0100
Subject: [PATCH 13/14] uncrustify

---
 src/panel/widgets/menu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 5485b5da..2ba3a77e 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -702,6 +702,7 @@ void WayfireMenu::refresh()
     {
         category_definition->items.clear();
     }
+
     for (auto child : flowbox.get_children())
     {
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));

From 04ad078b9d16b74ba1f970c182ca99a9b50a9267 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Fri, 12 Apr 2024 19:14:08 +0100
Subject: [PATCH 14/14] - CategoryDefinition is certainly not a definition now.

---
 src/panel/widgets/menu.cpp | 58 +++++++++++++++++++-------------------
 src/panel/widgets/menu.hpp |  6 ++--
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 2ba3a77e..8d2b5460 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -18,16 +18,16 @@
 #define MAX_LAUNCHER_NAME_LENGTH 11
 const std::string default_icon = ICONDIR "/wayfire.png";
 
-WfMenuCategoryDefinition::WfMenuCategoryDefinition(std::string _name, std::string _icon_name) :
+WfMenuCategory::WfMenuCategory(std::string _name, std::string _icon_name) :
     name(_name), icon_name(_icon_name)
 {}
 
-std::string WfMenuCategoryDefinition::get_name()
+std::string WfMenuCategory::get_name()
 {
     return name;
 }
 
-std::string WfMenuCategoryDefinition::get_icon_name()
+std::string WfMenuCategory::get_icon_name()
 {
     return icon_name;
 }
@@ -277,9 +277,9 @@ void WayfireMenu::load_menu_item(AppInfo app_info)
 void WayfireMenu::add_category_app(std::string category, Glib::RefPtr<Gio::DesktopAppInfo> app)
 {
     /* Filter for allowed categories */
-    if (category_definitions.count(category) == 1)
+    if (category_list.count(category) == 1)
     {
-        category_definitions[category]->items.push_back(app);
+        category_list[category]->items.push_back(app);
     }
 }
 
@@ -292,21 +292,21 @@ void WayfireMenu::populate_menu_categories()
     }
 
     // Iterate allowed categories in order
-    for (auto category : category_order)
+    for (auto category_name : category_order)
     {
-        if (category_definitions.count(category) == 1)
+        if (category_list.count(category_name) == 1)
         {
-            auto& category_definition = category_definitions[category];
-            if (category_definition->items.size() > 0)
+            auto& category = category_list[category_name];
+            if (category->items.size() > 0)
             {
-                auto icon_name = category_definition->get_icon_name();
-                auto name = category_definition->get_name();
-                auto category_button = new WfMenuCategoryButton(this, category, name, icon_name);
+                auto icon_name = category->get_icon_name();
+                auto name = category->get_name();
+                auto category_button = new WfMenuCategoryButton(this, category_name, name, icon_name);
                 category_box.pack_start(*category_button);
             }
         } else
         {
-            std::cerr << "Category in order without Category Definition : " << category << std::endl;
+            std::cerr << "Category in orderlist without Category object : " << category << std::endl;
         }
     }
 
@@ -321,7 +321,7 @@ void WayfireMenu::populate_menu_items(std::string category)
         gtk_widget_destroy(GTK_WIDGET(child->gobj()));
     }
 
-    for (auto app_info : category_definitions[category]->items)
+    for (auto app_info : category_list[category]->items)
     {
         auto app = new WfMenuMenuItem(this, app_info);
         flowbox.add(*app);
@@ -698,9 +698,9 @@ void WayfireMenu::on_logout_click()
 void WayfireMenu::refresh()
 {
     loaded_apps.clear();
-    for (auto& [key, category_definition] : category_definitions)
+    for (auto& [key, category] : category_list)
     {
-        category_definition->items.clear();
+        category->items.clear();
     }
 
     for (auto child : flowbox.get_children())
@@ -726,30 +726,30 @@ void WayfireMenu::init(Gtk::HBox *container)
     /* https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
      * Using the 'Main' categories, with names and icons assigned
      * Any Categories in .desktop files that are not in this list are ignored */
-    category_definitions["All"]     = std::make_unique<WfMenuCategoryDefinition>("All", "applications-other");
-    category_definitions["Network"] = std::make_unique<WfMenuCategoryDefinition>("Internet",
+    category_list["All"]     = std::make_unique<WfMenuCategory>("All", "applications-other");
+    category_list["Network"] = std::make_unique<WfMenuCategory>("Internet",
         "applications-internet");
-    category_definitions["Education"] = std::make_unique<WfMenuCategoryDefinition>("Education",
+    category_list["Education"] = std::make_unique<WfMenuCategory>("Education",
         "applications-education");
-    category_definitions["Office"] = std::make_unique<WfMenuCategoryDefinition>("Office",
+    category_list["Office"] = std::make_unique<WfMenuCategory>("Office",
         "applications-office");
-    category_definitions["Development"] = std::make_unique<WfMenuCategoryDefinition>("Development",
+    category_list["Development"] = std::make_unique<WfMenuCategory>("Development",
         "applications-development");
-    category_definitions["Graphics"] = std::make_unique<WfMenuCategoryDefinition>("Graphics",
+    category_list["Graphics"] = std::make_unique<WfMenuCategory>("Graphics",
         "applications-graphics");
-    category_definitions["AudioVideo"] = std::make_unique<WfMenuCategoryDefinition>("Multimedia",
+    category_list["AudioVideo"] = std::make_unique<WfMenuCategory>("Multimedia",
         "applications-multimedia");
-    category_definitions["Game"] = std::make_unique<WfMenuCategoryDefinition>("Games",
+    category_list["Game"] = std::make_unique<WfMenuCategory>("Games",
         "applications-games");
-    category_definitions["Science"] = std::make_unique<WfMenuCategoryDefinition>("Science",
+    category_list["Science"] = std::make_unique<WfMenuCategory>("Science",
         "applications-science");
-    category_definitions["Settings"] = std::make_unique<WfMenuCategoryDefinition>("Settings",
+    category_list["Settings"] = std::make_unique<WfMenuCategory>("Settings",
         "preferences-desktop");
-    category_definitions["System"] = std::make_unique<WfMenuCategoryDefinition>("System",
+    category_list["System"] = std::make_unique<WfMenuCategory>("System",
         "applications-system");
-    category_definitions["Utility"] = std::make_unique<WfMenuCategoryDefinition>("Accessories",
+    category_list["Utility"] = std::make_unique<WfMenuCategory>("Accessories",
         "applications-utilities");
-    category_definitions["Hidden"] = std::make_unique<WfMenuCategoryDefinition>("Other Desktops",
+    category_list["Hidden"] = std::make_unique<WfMenuCategory>("Other Desktops",
         "user-desktop");
 
     output->toggle_menu_signal().connect(sigc::mem_fun(this, &WayfireMenu::toggle_menu));
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 6c1e4348..069c623d 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -15,10 +15,10 @@
 class WayfireMenu;
 using AppInfo = Glib::RefPtr<Gio::AppInfo>;
 
-class WfMenuCategoryDefinition
+class WfMenuCategory
 {
   public:
-    WfMenuCategoryDefinition(std::string name, std::string icon_name);
+    WfMenuCategory(std::string name, std::string icon_name);
     std::string get_name();
     std::string get_icon_name();
     std::vector<Glib::RefPtr<Gio::DesktopAppInfo>> items;
@@ -157,7 +157,7 @@ class WayfireMenu : public WayfireWidget
     /* loaded_apps is a list of the already-opened applications + their execs,
      * so that we don't show duplicate entries */
     std::set<std::pair<std::string, std::string>> loaded_apps;
-    std::unordered_map<std::string, std::unique_ptr<WfMenuCategoryDefinition>> category_definitions;
+    std::unordered_map<std::string, std::unique_ptr<WfMenuCategory>> category_list;
     std::string category = "All";
     std::vector<std::string> category_order = {
         "All", "Network", "Education", "Office", "Development", "Graphics", "AudioVideo", "Game", "Science",