diff --git a/plugins/Analyzer/Analyzer.cpp b/plugins/Analyzer/Analyzer.cpp
index 13b91d9d3..0fa3dde06 100644
--- a/plugins/Analyzer/Analyzer.cpp
+++ b/plugins/Analyzer/Analyzer.cpp
@@ -343,8 +343,6 @@ void Analyzer::gotoFunctionEnd() {
  */
 QList<QAction *> Analyzer::cpuContextMenu() {
 
-	QList<QAction *> ret;
-
 	auto action_find                = new QAction(tr("Analyze Here"), this);
 	auto action_goto_function_start = new QAction(tr("Goto Function Start"), this);
 	auto action_goto_function_end   = new QAction(tr("Goto Function End"), this);
@@ -357,9 +355,13 @@ QList<QAction *> Analyzer::cpuContextMenu() {
 	connect(action_mark_function_start, &QAction::triggered, this, &Analyzer::markFunctionStart);
 	connect(action_xrefs, &QAction::triggered, this, &Analyzer::showXrefs);
 
-	ret << action_find << action_goto_function_start << action_goto_function_end << action_mark_function_start << action_xrefs;
-
-	return ret;
+	return {
+		action_find,
+		action_goto_function_start,
+		action_goto_function_end,
+		action_mark_function_start,
+		action_xrefs,
+	};
 }
 
 /**
diff --git a/plugins/Assembler/Assembler.cpp b/plugins/Assembler/Assembler.cpp
index 43b961388..d18b5c283 100644
--- a/plugins/Assembler/Assembler.cpp
+++ b/plugins/Assembler/Assembler.cpp
@@ -39,15 +39,12 @@ Assembler::~Assembler() {
  */
 QList<QAction *> Assembler::cpuContextMenu() {
 
-	QList<QAction *> ret;
-
 	auto action_assemble = new QAction(tr("&Assemble..."), this);
 	action_assemble->setShortcut(QKeySequence(tr("Space")));
 
 	connect(action_assemble, &QAction::triggered, this, &Assembler::showDialog);
-	ret << action_assemble;
 
-	return ret;
+	return {action_assemble};
 }
 
 /**
diff --git a/plugins/Bookmarks/Bookmarks.cpp b/plugins/Bookmarks/Bookmarks.cpp
index 8600ab4b1..616d284ab 100644
--- a/plugins/Bookmarks/Bookmarks.cpp
+++ b/plugins/Bookmarks/Bookmarks.cpp
@@ -88,13 +88,9 @@ QMenu *Bookmarks::menu(QWidget *parent) {
  */
 QList<QAction *> Bookmarks::cpuContextMenu() {
 
-	QList<QAction *> ret;
-
 	auto action_bookmark = new QAction(tr("Add &Bookmark"), this);
 	connect(action_bookmark, &QAction::triggered, this, &Bookmarks::addBookmarkMenu);
-	ret << action_bookmark;
-
-	return ret;
+	return {action_bookmark};
 }
 
 /**
diff --git a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
index b68b0b386..759173b9a 100644
--- a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
+++ b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
@@ -244,7 +244,8 @@ edb::EventStatus HardwareBreakpoints::handleEvent(const std::shared_ptr<IDebugEv
  * @return A list of QActions representing the context menu items.
  */
 QList<QAction *> HardwareBreakpoints::stackContextMenu() {
-	auto menu = new QMenu(tr("Hardware Breakpoints"));
+
+	auto menu = new QMenu(tr("Hardware Breakpoints"), edb::v1::debugger_ui);
 
 	auto rw1 = menu->addAction(tr("Hardware, On Read/Write #1"), this, &HardwareBreakpoints::setAccess1);
 	auto rw2 = menu->addAction(tr("Hardware, On Read/Write #2"), this, &HardwareBreakpoints::setAccess2);
@@ -266,12 +267,10 @@ QList<QAction *> HardwareBreakpoints::stackContextMenu() {
 	wo3->setData(1);
 	wo4->setData(1);
 
-	QList<QAction *> ret;
-
 	auto action = new QAction(tr("Hardware Breakpoints"), this);
 	action->setMenu(menu);
-	ret << action;
-	return ret;
+
+	return {action};
 }
 
 /**
@@ -280,7 +279,8 @@ QList<QAction *> HardwareBreakpoints::stackContextMenu() {
  * @return A list of QActions representing the context menu items.
  */
 QList<QAction *> HardwareBreakpoints::dataContextMenu() {
-	auto menu = new QMenu(tr("Hardware Breakpoints"));
+
+	auto menu = new QMenu(tr("Hardware Breakpoints"), edb::v1::debugger_ui);
 
 	auto rw1 = menu->addAction(tr("Hardware, On Read/Write #1"), this, &HardwareBreakpoints::setAccess1);
 	auto rw2 = menu->addAction(tr("Hardware, On Read/Write #2"), this, &HardwareBreakpoints::setAccess2);
@@ -302,12 +302,10 @@ QList<QAction *> HardwareBreakpoints::dataContextMenu() {
 	wo3->setData(2);
 	wo4->setData(2);
 
-	QList<QAction *> ret;
-
 	auto action = new QAction(tr("Hardware Breakpoints"), this);
 	action->setMenu(menu);
-	ret << action;
-	return ret;
+
+	return {action};
 }
 
 /**
@@ -317,11 +315,12 @@ QList<QAction *> HardwareBreakpoints::dataContextMenu() {
  */
 QList<QAction *> HardwareBreakpoints::cpuContextMenu() {
 
-	auto menu = new QMenu(tr("Hardware Breakpoints"));
-	auto ex1  = menu->addAction(tr("Hardware, On Execute #1"), this, &HardwareBreakpoints::setExec1);
-	auto ex2  = menu->addAction(tr("Hardware, On Execute #2"), this, &HardwareBreakpoints::setExec2);
-	auto ex3  = menu->addAction(tr("Hardware, On Execute #3"), this, &HardwareBreakpoints::setExec3);
-	auto ex4  = menu->addAction(tr("Hardware, On Execute #4"), this, &HardwareBreakpoints::setExec4);
+	auto menu = new QMenu(tr("Hardware Breakpoints"), edb::v1::debugger_ui);
+
+	auto ex1 = menu->addAction(tr("Hardware, On Execute #1"), this, &HardwareBreakpoints::setExec1);
+	auto ex2 = menu->addAction(tr("Hardware, On Execute #2"), this, &HardwareBreakpoints::setExec2);
+	auto ex3 = menu->addAction(tr("Hardware, On Execute #3"), this, &HardwareBreakpoints::setExec3);
+	auto ex4 = menu->addAction(tr("Hardware, On Execute #4"), this, &HardwareBreakpoints::setExec4);
 
 	auto rw1 = menu->addAction(tr("Hardware, On Read/Write #1"), this, &HardwareBreakpoints::setAccess1);
 	auto rw2 = menu->addAction(tr("Hardware, On Read/Write #2"), this, &HardwareBreakpoints::setAccess2);
@@ -348,12 +347,10 @@ QList<QAction *> HardwareBreakpoints::cpuContextMenu() {
 	wo3->setData(3);
 	wo4->setData(3);
 
-	QList<QAction *> ret;
-
 	auto action = new QAction(tr("Hardware Breakpoints"), this);
 	action->setMenu(menu);
-	ret << action;
-	return ret;
+
+	return {action};
 }
 
 /**