diff --git a/.ecode/project_build.json b/.ecode/project_build.json
index 0417c4d53..11992a159 100644
--- a/.ecode/project_build.json
+++ b/.ecode/project_build.json
@@ -70,6 +70,20 @@
         "relative_file_paths": true
       }
     },
+    "run": [
+      {
+        "args": "-x",
+        "command": "${project_root}/bin/ecode-debug",
+        "name": "ecode-debug",
+        "working_dir": "${project_root}/bin/"
+      },
+      {
+        "args": "-x",
+        "command": "${project_root}/bin/ecode",
+        "name": "ecode-release",
+        "working_dir": "${project_root}/bin/"
+      }
+    ],
     "var": {
       "build_dir": "${project_root}/projects/${os}"
     }
@@ -150,7 +164,14 @@
       {
         "args": "-x",
         "command": "ecode-debug",
-        "working_dir": "${project_root}/bin/"
+        "name": "ecode-debug",
+        "working_dir": "${project_root}/bin"
+      },
+      {
+        "args": "-x",
+        "command": "ecode",
+        "name": "ecode-release",
+        "working_dir": "${project_root}/bin"
       }
     ],
     "var": {
@@ -188,6 +209,20 @@
         "relative_file_paths": true
       }
     },
+    "run": [
+      {
+        "args": "-x",
+        "command": "${project_root}/bin/ecode-debug",
+        "name": "ecode-debug",
+        "working_dir": "${project_root}/bin/"
+      },
+      {
+        "args": "-x",
+        "command": "${project_root}/bin/ecode",
+        "name": "ecode-release",
+        "working_dir": "${project_root}/bin/"
+      }
+    ],
     "var": {
       "build_dir": "${project_root}/projects/${os}"
     }
diff --git a/src/eepp/ui/uidropdownlist.cpp b/src/eepp/ui/uidropdownlist.cpp
index 6dbec8c03..ca546f126 100644
--- a/src/eepp/ui/uidropdownlist.cpp
+++ b/src/eepp/ui/uidropdownlist.cpp
@@ -239,6 +239,7 @@ void UIDropDownList::setStyleConfig( const StyleConfig& styleConfig ) {
 
 void UIDropDownList::onWidgetClear( const Event* ) {
 	setText( "" );
+	sendCommonEvent( Event::OnClear );
 }
 
 void UIDropDownList::onItemKeyDown( const Event* Event ) {
diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp
index 7511efb11..829c60c40 100644
--- a/src/eepp/ui/uilistbox.cpp
+++ b/src/eepp/ui/uilistbox.cpp
@@ -214,6 +214,9 @@ void UIListBox::removeListBoxItems( std::vector<Uint32> ItemsIndex ) {
 
 	if ( selectedSize != mSelected.size() )
 		sendCommonEvent( Event::OnSelectionChanged );
+
+	if ( mTexts.empty() )
+		sendCommonEvent( Event::OnClear );
 }
 
 void UIListBox::clear() {
@@ -231,7 +234,7 @@ void UIListBox::clear() {
 }
 
 Uint32 UIListBox::removeListBoxItem( Uint32 ItemIndex ) {
-	removeListBoxItems( std::vector<Uint32>( 1, ItemIndex ) );
+	removeListBoxItems( { ItemIndex } );
 
 	return ItemIndex;
 }
diff --git a/src/tools/ecode/appconfig.cpp b/src/tools/ecode/appconfig.cpp
index 9009c1084..b0f3e8145 100644
--- a/src/tools/ecode/appconfig.cpp
+++ b/src/tools/ecode/appconfig.cpp
@@ -395,6 +395,7 @@ void AppConfig::saveProject( std::string projectFolder, UICodeEditorSplitter* ed
 	cfg.setValueI( "document", "line_breaking_column", docConfig.doc.lineBreakingColumn );
 	cfg.setValue( "build", "build_name", buildConfig.buildName );
 	cfg.setValue( "build", "build_type", buildConfig.buildType );
+	cfg.setValue( "build", "run_name", buildConfig.runName );
 	cfg.setValue( "nodes", "documents",
 				  saveNode( editorSplitter->getBaseLayout()->getFirstChild() ).dump() );
 	cfg.deleteKey( "files" );
@@ -540,6 +541,7 @@ void AppConfig::loadProject( std::string projectFolder, UICodeEditorSplitter* ed
 		ProjectBuildConfiguration prjCfg;
 		prjCfg.buildName = cfg.getValue( "build", "build_name", "" );
 		prjCfg.buildType = cfg.getValue( "build", "build_type", "" );
+		prjCfg.runName = cfg.getValue( "build", "run_name", "" );
 		app->getProjectBuildManager()->setConfig( prjCfg );
 	}
 
diff --git a/src/tools/ecode/appconfig.hpp b/src/tools/ecode/appconfig.hpp
index 49a1adf9c..690829fee 100644
--- a/src/tools/ecode/appconfig.hpp
+++ b/src/tools/ecode/appconfig.hpp
@@ -118,6 +118,7 @@ struct ProjectBuildConfiguration {
 	ProjectBuildConfiguration() {}
 	std::string buildName;
 	std::string buildType;
+	std::string runName;
 };
 
 class NewTerminalOrientation {
diff --git a/src/tools/ecode/applayout.xml.hpp b/src/tools/ecode/applayout.xml.hpp
index 9115197b5..432a67f94 100644
--- a/src/tools/ecode/applayout.xml.hpp
+++ b/src/tools/ecode/applayout.xml.hpp
@@ -317,6 +317,9 @@ TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child
 .settings_panel .buttons_box > * {
 	margin-bottom: 4dp;
 }
+.settings_panel .stack_margins > * {
+	margin-right:4dp;
+}
 .settings_panel TableView {
 	margin-top: 4dp;
 }
diff --git a/src/tools/ecode/iconmanager.cpp b/src/tools/ecode/iconmanager.cpp
index 7048b2a28..19832bc7b 100644
--- a/src/tools/ecode/iconmanager.cpp
+++ b/src/tools/ecode/iconmanager.cpp
@@ -241,6 +241,7 @@ void IconManager::init( UISceneNode* sceneNode, FontTrueType* iconFont, FontTrue
 			{ "extensions", 0xeae6 },
 			{ "window-opt", 0xeb7f },
 			{ "tools", 0xeb6d },
+			{ "play", 0xeb2c },
 		};
 
 		for ( const auto& icon : codIcons )
diff --git a/src/tools/ecode/projectbuild.cpp b/src/tools/ecode/projectbuild.cpp
index f4f459efb..457822773 100644
--- a/src/tools/ecode/projectbuild.cpp
+++ b/src/tools/ecode/projectbuild.cpp
@@ -92,13 +92,12 @@ json ProjectBuild::serialize( const ProjectBuild::Map& builds ) {
 			jclean.push_back( step );
 		}
 
-		// TODO: Support multiple-runs
 		if ( curBuild.hasRun() ) {
 			bj["run"] = json::array();
 			auto& jrun = bj["run"];
-			{
-				const auto& run = curBuild.mRun;
+			for ( auto& run : curBuild.mRun ) {
 				json step;
+				step["name"] = run.name;
 				step["working_dir"] = run.workingDir;
 				step["args"] = run.args;
 				step["command"] = run.cmd;
@@ -519,12 +518,13 @@ ProjectBuild::Map ProjectBuild::deserialize( const json& j, const std::string& p
 			const auto& runArray = buildObj["run"];
 			for ( const auto& step : runArray ) {
 				ProjectBuildStep rstep;
+				rstep.name = step.value( "name", "" );
 				rstep.cmd = step.value( "command", "" );
 				rstep.args = step.value( "args", "" );
 				rstep.workingDir = step.value( "working_dir", "" );
 				rstep.enabled = step.value( "enabled", true );
 				rstep.runInTerminal = step.value( "run_in_terminal", false );
-				b.mRun = std::move( rstep );
+				b.mRun.emplace_back( std::move( rstep ) );
 			}
 		}
 
@@ -686,25 +686,20 @@ ProjectBuildConfiguration ProjectBuildManager::getConfig() const {
 }
 
 void ProjectBuildManager::setConfig( const ProjectBuildConfiguration& config ) {
-	bool buildNameChanged = false;
-	bool buildTypeChanged = false;
-
 	if ( mConfig.buildName != config.buildName ) {
 		mConfig.buildName = config.buildName;
-		buildNameChanged = true;
 		updateSidePanelTab();
 	}
 
 	if ( mConfig.buildType != config.buildType ) {
 		mConfig.buildType = config.buildType;
-		buildTypeChanged = true;
 		updateBuildType();
 	}
 
-	if ( buildNameChanged )
-		updateSidePanelTab();
-	else if ( buildTypeChanged )
-		updateBuildType();
+	if ( mConfig.runName != config.runName ) {
+		mConfig.runName = config.runName;
+		updateRunConfig();
+	}
 }
 
 void ProjectBuildManager::buildCurrentConfig( StatusBuildOutputController* sboc ) {
@@ -736,18 +731,30 @@ void ProjectBuildManager::cleanCurrentConfig( StatusBuildOutputController* sboc
 }
 
 void ProjectBuildManager::runCurrentConfig( StatusBuildOutputController* /* not used yet */ ) {
-	if ( !isBuilding() && !getBuilds().empty() ) {
+	if ( !mRunning && !isBuilding() && !getBuilds().empty() ) {
+		BoolScopedOp op( mRunning, true );
 		const ProjectBuild* build = nullptr;
 		for ( const auto& buildIt : getBuilds() )
 			if ( buildIt.second.getName() == mConfig.buildName )
 				build = &buildIt.second;
 
 		if ( build && build->hasRun() ) {
-			auto finalBuild( build->replaceVars( build->mRun ) );
+			const ProjectBuildStep* run = nullptr;
+			for ( const auto& crun : build->mRun ) {
+				if ( crun.name == mConfig.runName || mConfig.runName.empty() ) {
+					run = &crun;
+					break;
+				}
+			}
+
+			if ( nullptr == run )
+				return;
+
+			auto finalBuild( build->replaceVars( *run ) );
 			auto cmd = finalBuild.cmd + " " + finalBuild.args;
 			if ( finalBuild.runInTerminal ) {
-				UITerminal* term =
-					mApp->getTerminalManager()->createTerminalInSplitter( finalBuild.workingDir );
+				UITerminal* term = mApp->getTerminalManager()->createTerminalInSplitter(
+					finalBuild.workingDir, false );
 				if ( term == nullptr || term->getTerm() == nullptr ) {
 					mApp->getTerminalManager()->openInExternalTerminal( cmd );
 				} else {
@@ -920,17 +927,20 @@ void ProjectBuildManager::buildSidePanelTab() {
 		R"html(
 			<ScrollView id="build_tab_view" lw="mp" lh="mp">
 				<vbox lw="mp" lh="wc" padding="4dp">
-					<TextView text="@string(build_settings, Build Settings)" font-size="15dp" />
-					<TextView text="@string(build_configuration, Build Configuration)" />
+					<TextView text="@string(build_settings, Build Settings)" font-size="15dp" focusable="false" />
+					<TextView text="@string(build_configuration, Build Configuration)" focusable="false" />
 					<hbox lw="mp" lh="wc" margin-bottom="4dp">
 						<DropDownList id="build_list" layout_width="0" lw8="1" layout_height="wrap_content" />
 						<PushButton id="build_edit" id="build_edit" text="@string(edit_build, Edit Build)" tooltip="@string(edit_build, Edit Build)"  text-as-fallback="true" icon="icon(file-edit, 12dp)" margin-left="2dp" />
 						<PushButton id="build_add" id="build_add" text="@string(add_build, Add Build)" tooltip="@string(add_build, Add Build)" text-as-fallback="true" icon="icon(add, 12dp)" margin-left="2dp" />
 					</hbox>
-					<TextView text="@string(build_target, Build Target)" margin-top="8dp" />
-					<DropDownList lw="mp" id="build_type_list" />
+					<TextView text="@string(build_target, Build Target)" margin-top="8dp" focusable="false" />
+					<DropDownList lw="mp" id="build_type_list" margin-top="2dp" />
 					<PushButton id="build_button" lw="mp" lh="wc" text="@string(build, Build)" margin-top="8dp" icon="icon(hammer, 12dp)" />
 					<PushButton id="clean_button" lw="mp" lh="wc" text="@string(clean, Clean)" margin-top="8dp" icon="icon(eraser, 12dp)" />
+					<TextView text="@string(run_target, Run Target)" margin-top="8dp" focusable="false" />
+					<DropDownList lw="mp" id="run_config_list" margin-top="2dp" />
+					<PushButton id="run_button" lw="mp" lh="wc" text="@string(run, Run)" margin-top="8dp" icon="icon(play, 12dp)" />
 				</vbox>
 			</ScrollView>
 		)html" );
@@ -958,6 +968,7 @@ void ProjectBuildManager::updateSidePanelTab() {
 	UIDropDownList* buildList = buildTab->find<UIDropDownList>( "build_list" );
 	UIPushButton* buildButton = buildTab->find<UIPushButton>( "build_button" );
 	UIPushButton* cleanButton = buildTab->find<UIPushButton>( "clean_button" );
+	UIPushButton* runButton = buildTab->find<UIPushButton>( "run_button" );
 	UIPushButton* buildAdd = buildTab->find<UIPushButton>( "build_add" );
 	UIPushButton* buildEdit = buildTab->find<UIPushButton>( "build_edit" );
 
@@ -988,12 +999,16 @@ void ProjectBuildManager::updateSidePanelTab() {
 
 	updateBuildType();
 
+	updateRunConfig();
+
 	if ( !buildList->hasEventsOfType( Event::OnItemSelected ) ) {
 		buildList->on( Event::OnItemSelected, [this, buildEdit, buildList]( const Event* ) {
 			mConfig.buildName = buildList->getListBox()->getItemSelectedText();
 			mConfig.buildType = "";
+			mConfig.runName = "";
 			buildEdit->setEnabled( true );
 			updateBuildType();
+			updateRunConfig();
 		} );
 	}
 
@@ -1023,6 +1038,11 @@ void ProjectBuildManager::updateSidePanelTab() {
 		} );
 	}
 
+	if ( !runButton->hasEventsOfType( Event::MouseClick ) ) {
+		runButton->onClick(
+			[this]( auto ) { runCurrentConfig( mApp->getStatusBuildOutputController() ); } );
+	}
+
 	if ( !buildAdd->hasEventsOfType( Event::MouseClick ) ) {
 		buildAdd->onClick( [this, buildTab]( auto ) { addBuild( buildTab ); } );
 	}
@@ -1064,10 +1084,65 @@ void ProjectBuildManager::updateBuildType() {
 	}
 	buildTypeList->setEnabled( !buildTypeList->getListBox()->isEmpty() );
 
-	if ( !buildTypeList->hasEventsOfType( Event::OnItemSelected ) )
+	if ( !buildTypeList->hasEventsOfType( Event::OnItemSelected ) ) {
 		buildTypeList->on( Event::OnItemSelected, [this, buildTypeList]( const Event* ) {
 			mConfig.buildType = buildTypeList->getListBox()->getItemSelectedText();
 		} );
+	}
+}
+
+void ProjectBuildManager::updateRunConfig() {
+	if ( mTab == nullptr )
+		return;
+	UIWidget* buildTab = mTab->getOwnedWidget()->find<UIWidget>( "build_tab_view" );
+	if ( buildTab == nullptr )
+		return;
+	UIDropDownList* buildList = buildTab->find<UIDropDownList>( "build_list" );
+	UIDropDownList* runConfigList = buildTab->find<UIDropDownList>( "run_config_list" );
+
+	runConfigList->getListBox()->clear();
+
+	String first = buildList->getListBox()->getItemSelectedText();
+	if ( !first.empty() ) {
+		auto foundIt = mBuilds.find( first );
+		if ( foundIt != mBuilds.end() ) {
+			const auto& runConfigs = foundIt->second.runConfigs();
+			std::vector<String> items;
+			size_t i = 1;
+			for ( const auto& run : runConfigs ) {
+				auto name = run.name.empty() ? String::format( mApp->i18n( "custom_executable_num",
+																		   "Custom Executable %d" )
+																   .toUtf8(),
+															   i )
+											 : run.name;
+				items.emplace_back( name );
+				i++;
+			}
+			runConfigList->getListBox()->addListBoxItems( items );
+			if ( runConfigList->getListBox()->getItemIndex( mConfig.runName ) !=
+				 eeINDEX_NOT_FOUND ) {
+				runConfigList->getListBox()->setSelected( mConfig.runName );
+			} else if ( !runConfigList->getListBox()->isEmpty() ) {
+				runConfigList->getListBox()->setSelected( 0 );
+				mConfig.runName = runConfigList->getListBox()->getItemSelectedText();
+			}
+		}
+	}
+	runConfigList->setEnabled( !runConfigList->getListBox()->isEmpty() );
+	buildTab->find( "run_button" )->setEnabled( !runConfigList->getListBox()->isEmpty() );
+
+	if ( !runConfigList->hasEventsOfType( Event::OnItemSelected ) ) {
+		runConfigList->on( Event::OnItemSelected, [this, runConfigList, buildTab]( const Event* ) {
+			mConfig.runName = runConfigList->getListBox()->getItemSelectedText();
+			buildTab->find( "run_button" )->setEnabled( !runConfigList->getListBox()->isEmpty() );
+		} );
+	}
+	if ( !runConfigList->hasEventsOfType( Event::OnClear ) ) {
+		runConfigList->on( Event::OnClear, [this, runConfigList, buildTab]( const Event* ) {
+			mConfig.runName = "";
+			buildTab->find( "run_button" )->setEnabled( !runConfigList->getListBox()->isEmpty() );
+		} );
+	}
 }
 
 std::map<std::string, ProjectBuildOutputParser> ProjectBuildOutputParser::getPresets() {
diff --git a/src/tools/ecode/projectbuild.hpp b/src/tools/ecode/projectbuild.hpp
index a17132626..c3cf6e86b 100644
--- a/src/tools/ecode/projectbuild.hpp
+++ b/src/tools/ecode/projectbuild.hpp
@@ -82,6 +82,7 @@ struct ProjectBuildStep {
 	std::string cmd;
 	std::string args;
 	std::string workingDir;
+	std::string name;
 	bool enabled{ true };
 	bool runInTerminal{ false };
 };
@@ -172,7 +173,7 @@ class ProjectBuild {
 
 	const ProjectBuildSteps& cleanSteps() const { return mClean; }
 
-	const ProjectBuildStep& runStep() const { return mRun; }
+	const ProjectBuildSteps& runConfigs() const { return mRun; }
 
 	const ProjectBuildKeyVal& envs() const { return mEnvs; }
 
@@ -183,7 +184,8 @@ class ProjectBuild {
 	bool hasClean() const { return !mClean.empty(); }
 
 	bool hasRun() const {
-		return !mRun.cmd.empty() || !mRun.args.empty() || !mRun.workingDir.empty();
+		return !mRun.empty() && ( !mRun.front().cmd.empty() || !mRun.front().args.empty() ||
+								  !mRun.front().workingDir.empty() );
 	}
 
 	ProjectBuildStep replaceVars( const ProjectBuildStep& step ) const;
@@ -204,7 +206,7 @@ class ProjectBuild {
 	std::set<std::string> mBuildTypes;
 	ProjectBuildSteps mBuild;
 	ProjectBuildSteps mClean;
-	ProjectBuildStep mRun;
+	ProjectBuildSteps mRun;
 	ProjectBuildKeyVal mEnvs;
 	ProjectBuildKeyVal mVars;
 	ProjectBuildConfig mConfig;
@@ -317,6 +319,7 @@ class ProjectBuildManager {
 	bool mBuilding{ false };
 	bool mShuttingDown{ false };
 	bool mCancelBuild{ false };
+	bool mRunning{ false };
 	std::unordered_map<Node*, std::set<Uint32>> mCbs;
 
 	void runBuild( const std::string& buildName, const std::string& buildType,
@@ -336,6 +339,8 @@ class ProjectBuildManager {
 
 	void updateBuildType();
 
+	void updateRunConfig();
+
 	void addNewBuild();
 
 	bool cloneBuild( const std::string& build, std::string newBuildName );
diff --git a/src/tools/ecode/terminalmanager.cpp b/src/tools/ecode/terminalmanager.cpp
index 33b9528c8..8ca3768ed 100644
--- a/src/tools/ecode/terminalmanager.cpp
+++ b/src/tools/ecode/terminalmanager.cpp
@@ -6,7 +6,8 @@ namespace ecode {
 
 TerminalManager::TerminalManager( App* app ) : mApp( app ) {}
 
-UITerminal* TerminalManager::createTerminalInSplitter( const std::string& workingDir ) {
+UITerminal* TerminalManager::createTerminalInSplitter( const std::string& workingDir,
+													   bool fallback ) {
 	UITerminal* term = nullptr;
 	auto splitter = mApp->getSplitter();
 	auto& config = mApp->getConfig();
@@ -15,34 +16,36 @@ UITerminal* TerminalManager::createTerminalInSplitter( const std::string& workin
 			UIOrientation orientation = splitter->getMainSplitOrientation();
 			if ( config.term.newTerminalOrientation == NewTerminalOrientation::Vertical &&
 				 orientation == UIOrientation::Horizontal ) {
-				term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir );
+				term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, "", {},
+										  fallback );
 			} else if ( config.term.newTerminalOrientation == NewTerminalOrientation::Horizontal &&
 						orientation == UIOrientation::Vertical ) {
-				term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir );
+				term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, "", {},
+										  fallback );
 			} else {
 				term = createNewTerminal( "", nullptr, workingDir );
 			}
 		} else {
 			term = createNewTerminal();
 		}
-	} else {
+	} else if ( splitter ) {
 		switch ( config.term.newTerminalOrientation ) {
 			case NewTerminalOrientation::Vertical: {
 				auto cwd = workingDir.empty() ? mApp->getCurrentWorkingDir() : workingDir;
 				splitter->split( UICodeEditorSplitter::SplitDirection::Right,
 								 splitter->getCurWidget(), false );
-				term = createNewTerminal( "", nullptr, cwd );
+				term = createNewTerminal( "", nullptr, cwd, "", {}, fallback );
 				break;
 			}
 			case NewTerminalOrientation::Horizontal: {
 				auto cwd = workingDir.empty() ? mApp->getCurrentWorkingDir() : workingDir;
 				splitter->split( UICodeEditorSplitter::SplitDirection::Bottom,
 								 splitter->getCurWidget(), false );
-				term = createNewTerminal( "", nullptr, cwd );
+				term = createNewTerminal( "", nullptr, cwd, "", {}, fallback );
 				break;
 			}
 			case NewTerminalOrientation::Same: {
-				term = createNewTerminal();
+				term = createNewTerminal( "", nullptr, "", "", {}, fallback );
 				break;
 			}
 		}
@@ -283,8 +286,8 @@ static void openExternal( const std::string& defShell, const std::string& cmd =
 	std::vector<std::string> options;
 	if ( !defShell.empty() )
 		options.push_back( defShell );
-	options.push_back( "powershell" );
 	options.push_back( "cmd" );
+	options.push_back( "powershell" );
 #else
 static void openExternal( const std::string&, const std::string& cmd = "" ) {
 	std::vector<std::string> options = { "gnome-terminal", "konsole", "xterm", "st" };
@@ -294,7 +297,7 @@ static void openExternal( const std::string&, const std::string& cmd = "" ) {
 		if ( !externalShell.empty() ) {
 			if ( !cmd.empty() ) {
 #if EE_PLATFORM == EE_PLATFORM_WIN
-				auto fcmd = externalShell + " /c " + cmd;
+				auto fcmd = externalShell + " /q /c " + cmd;
 #else
 				auto fcmd = externalShell + " -e " + cmd;
 #endif
@@ -343,7 +346,8 @@ void TerminalManager::displayError() {
 
 UITerminal* TerminalManager::createNewTerminal( const std::string& title, UITabWidget* inTabWidget,
 												const std::string& workingDir, std::string program,
-												const std::vector<std::string>& args ) {
+												const std::vector<std::string>& args,
+												bool fallback ) {
 #if EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN
 	UIMessageBox* msgBox = UIMessageBox::New(
 		UIMessageBox::OK,
@@ -390,7 +394,8 @@ UITerminal* TerminalManager::createNewTerminal( const std::string& title, UITabW
 		mApp->termConfig().scrollback, nullptr, mUseFrameBuffer );
 
 	if ( term == nullptr || term->getTerm() == nullptr ) {
-		displayError();
+		if ( fallback )
+			displayError();
 		return nullptr;
 	}
 
diff --git a/src/tools/ecode/terminalmanager.hpp b/src/tools/ecode/terminalmanager.hpp
index 95e0bdde6..023b920ef 100644
--- a/src/tools/ecode/terminalmanager.hpp
+++ b/src/tools/ecode/terminalmanager.hpp
@@ -15,12 +15,14 @@ class TerminalManager {
   public:
 	TerminalManager( App* app );
 
-	UITerminal* createTerminalInSplitter( const std::string& workingDir = "" );
+	UITerminal* createTerminalInSplitter( const std::string& workingDir = "",
+										  bool fallback = true );
 
 	UITerminal* createNewTerminal( const std::string& title = "",
 								   UITabWidget* inTabWidget = nullptr,
 								   const std::string& workingDir = "", std::string program = "",
-								   const std::vector<std::string>& args = {} );
+								   const std::vector<std::string>& args = {},
+								   bool fallback = true );
 
 	void applyTerminalColorScheme( const TerminalColorScheme& colorScheme );
 
diff --git a/src/tools/ecode/uibuildsettings.cpp b/src/tools/ecode/uibuildsettings.cpp
index 2bd6fc970..7fa27721c 100644
--- a/src/tools/ecode/uibuildsettings.cpp
+++ b/src/tools/ecode/uibuildsettings.cpp
@@ -82,30 +82,30 @@ class UICustomOutputParserWindow : public UIWindow {
 		mCfg( cfg ) {
 		static const auto CUSTOM_OUTPUT_PARSER_XML = R"xml(
 <vbox class="custom_output_parser_cont" lw="400dp" lh="wc">
-	<TextView text="@string(type, Type)" />
+	<TextView text="@string(type, Type)" focusable="false" />
 	<DropDownList lw="mp" lh="wc" id="custom_parser_type" selectedIndex="0">
 		<item>@string("error", "Error")</item>
 		<item>@string("warning", "Warning")</item>
 		<item>@string("notice", "Notice")</item>
 	</DropDownList>
-	<TextView text="@string(message_capture_pattern, Message Capture Pattern)" />
+	<TextView text="@string(message_capture_pattern, Message Capture Pattern)" focusable="false" />
 	<TextInput lw="mp" lh="wc" id="custom_parser_pattern" hint="@string(lua_pattern, Lua Pattern)" />
-	<TextView text="@string(capture_positions, Capture Positions)" />
+	<TextView text="@string(capture_positions, Capture Positions)" focusable="false" />
 	<hbox lw="mp" lh="wc" class="capture_positions_cont">
 		<vbox lw="0" lw8="0.25" lh="wc">
-			<TextView lw="mp" lh="wc" text="@string(file_name, File Name)" />
+			<TextView lw="mp" lh="wc" text="@string(file_name, File Name)" focusable="false" />
 			<SpinBox id="file_name_pos" lw="mp" lh="wc" min-value="0" max-value="4" value="1" />
 		</vbox>
 		<vbox lw="0" lw8="0.25" lh="wc">
-			<TextView lw="mp" lh="wc" text="@string(line_number, Line Number)" />
+			<TextView lw="mp" lh="wc" text="@string(line_number, Line Number)" focusable="false" />
 			<SpinBox id="line_number_pos" lw="mp" lh="wc" min-value="0" max-value="4" value="2" />
 		</vbox>
 		<vbox lw="0" lw8="0.25" lh="wc">
-			<TextView lw="mp" lh="wc" text="@string(column_position, Column Position)" />
+			<TextView lw="mp" lh="wc" text="@string(column_position, Column Position)" focusable="false" />
 			<SpinBox id="column_pos" lw="mp" lh="wc" min-value="0" max-value="4" value="3" />
 		</vbox>
 		<vbox lw="0" lw8="0.25" lh="wc">
-			<TextView lw="mp" lh="wc" text="@string(message, Message)" />
+			<TextView lw="mp" lh="wc" text="@string(message, Message)" focusable="false" />
 			<SpinBox id="message_pos" lw="mp" lh="wc" min-value="0" max-value="4" value="4" />
 		</vbox>
 	</hbox>
@@ -215,6 +215,10 @@ class UIBuildStep : public UILinearLayout {
 		mStep = buildStep;
 		addClass( String::toString( mStepNum ) );
 
+		forEachChild( [buildStep]( Node* node ) { node->setEnabled( buildStep != nullptr ); } );
+		if ( buildStep == nullptr )
+			return;
+
 		auto stepName = findByClass<UITextView>( "step_name" );
 		if ( isBuildOrClean() ) {
 			stepName->setText( String::format( mBuildSettings->getUISceneNode()
@@ -250,7 +254,7 @@ class UIBuildStep : public UILinearLayout {
 
 		static const auto BUILD_STEP_XML = R"xml(
 	<hbox class="header" lw="mp" lh="wc">
-		<TextView lw="0" lw8="1" class="step_name" />
+		<TextView lw="0" lw8="1" class="step_name" focusable="false" />
 		<CheckBox class="enabled_checkbox" checked="true" layout_gravity="center_vertical" tooltip="@string(enabled_question, Enabled?)" />
 		<PushButton class="move_up" text="@string(move_up, Move Up)" text-as-fallback="true" icon="icon(arrow-up-s, 12dp)" tooltip="@string(move_up, Move Up)" />
 		<PushButton class="move_down" text="@string(move_down, Move Down)" text-as-fallback="true" icon="icon(arrow-down-s, 12dp)"  tooltip="@string(move_down, Move Down)" />
@@ -259,15 +263,15 @@ class UIBuildStep : public UILinearLayout {
 	</hbox>
 	<vbox class="details" lw="mp" lh="wc">
 		<hbox lw="mp">
-			<TextView lh="mp" min-width="100dp" text="@string(command, Command)" />
+			<TextView lh="mp" min-width="100dp" text="@string(command, Command)" focusable="false" />
 			<Input class="input_cmd" lw="0" lw8="1" />
 		</hbox>
 		<hbox lw="mp">
-			<TextView lh="mp" min-width="100dp" text="@string(arguments, Arguments)" />
+			<TextView lh="mp" min-width="100dp" text="@string(arguments, Arguments)" focusable="false" />
 			<Input class="input_args" lw="0" lw8="1" />
 		</hbox>
 		<hbox lw="mp">
-			<TextView lh="mp" min-width="100dp" text="@string(working_dir, Working Directory)" />
+			<TextView lh="mp" min-width="100dp" text="@string(working_dir, Working Directory)" focusable="false" />
 			<Input class="input_working_dir" lw="0" lw8="1" />
 		</hbox>
 		<CheckBox class="run_in_terminal" text="@string(run_in_terminal, Run in terminal)" visible="false" />
@@ -338,9 +342,9 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 			<PushButton id="build_del" lh="mp" text="@string(delete_setting, Delete Setting)" text-as-fallback="true" icon="icon(delete-bin, 12dp)" tooltip="@string(delete_setting, Delete Setting)" />
 		</hbox>
 		<Widget class="separator" lw="mp" lh="1dp" />
-		<TextView class="subtitle" text="@string(build_name, Build Name)" />
+		<TextView class="subtitle" text="@string(build_name, Build Name)" focusable="false" />
 		<Input id="build_name" lw="mp" lh="wc" text="new_name" />
-		<TextView class="subtitle" text="@string(supported_platforms, Supported Platforms)" />
+		<TextView class="subtitle" text="@string(supported_platforms, Supported Platforms)" focusable="false" />
 		<TextView lw="mp" lh="wc" word-wrap="true" text="@string(supported_platforms_desc, Selecting none means that the build settings will work and be available on any Operating System)" />
 		<StackLayout id="os_select" class="os_select" lw="wc" lh="wc">
 			<CheckBox id="linux" text="Linux" />
@@ -353,24 +357,33 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 		</StackLayout>
 
 		<vbox lw="mp" lh="wc" class="build_steps">
-			<TextView class="subtitle" text="@string(build_steps, Build Steps)" />
+			<TextView class="subtitle" text="@string(build_steps, Build Steps)" focusable="false" />
 			<vbox id="build_steps_cont" lw="mp" lh="wc"></vbox>
 			<PushButton id="add_build_step" class="add_build_step" text="@string(add_build_step, Add Build Step)" />
 		</vbox>
 
 		<vbox lw="mp" lh="wc" class="clean_steps">
-			<TextView class="subtitle" text="@string(clean_steps, Clean Steps)" />
+			<TextView class="subtitle" text="@string(clean_steps, Clean Steps)" focusable="false" />
 			<vbox id="build_clean_steps_cont" lw="mp" lh="wc"></vbox>
 			<PushButton id="add_clean_step" class="add_build_step" text="@string(add_clean_step, Add Clean Step)" />
 		</vbox>
 
 		<vbox lw="mp" lh="wc" class="run_step">
-			<TextView class="subtitle" text="@string(run, Run)" />
-			<vbox id="run_step_cont" lw="mp" lh="wc"></vbox>
+			<TextView class="subtitle" text="@string(run, Run)" focusable="false" />
+			<StackLayout is="run_select" lw="mp" lh="wc" class="stack_margins">
+				<TextView text="@string(run_configuration_colon, Run configuration:)" focusable="false" />
+				<DropDownList id="run_list" layout_width="200dp" layout_height="19dp" />
+				<PushButton id="run_add" text="@string(add_ellipsis, Add...)" />
+				<PushButton id="run_remove" text="@string(remove, Remove)" />
+				<PushButton id="run_remove_all" text="@string(remove_all, Remove All)" />
+				<PushButton id="run_rename" text="@string(rename_ellipsis, Rename...)" />
+				<PushButton id="run_clone" text="@string(clone_ellipsis, Clone...)" />
+			</StackLayout>
+			<vbox id="run_cont" lw="mp" lh="wc"></vbox>
 		</vbox>
 
 		<vbox lw="mp" lh="wc" class="build_types">
-			<TextView class="subtitle" text="@string(build_types, Build Types)" />
+			<TextView class="subtitle" text="@string(build_types, Build Types)" focusable="false" />
 			<TextView lw="mp" lh="wc" word-wrap="true" text="@string(build_types_desc, Build types can be used as a dynamic build option represented by the special key ${build_type}. The build type can be switch easily from the editor.)" />
 			<StackLayout class="build_types_cont span" lw="mp" lh="wc">
 				<DropDownList id="build_type_list" layout_width="200dp" layout_height="wc" />
@@ -386,7 +399,7 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 			</hbox>
 			<vbox class="inner_box" lw="mp" lh="wc">
 				<vbox lw="mp" lh="wc" class="custom_vars">
-					<TextView class="subtitle" text="@string(custom_variables, Custom Variables)" />
+					<TextView class="subtitle" text="@string(custom_variables, Custom Variables)" focusable="false" />
 					<TextView lw="mp" lh="wc" word-wrap="true" text='@string(custom_variables_desc, "Custom Variables allow to simplify the build commands steps adding custom variables that can be used over the build settings in commands, arguments, and working directories.")' />
 					<TextView lw="mp" lh="wc" word-wrap="true" text='@string(custom_variables_desc_2, "Custom Variables can be invoked using ${variable_name} in any of the commands.)' />
 					<hbox lw="mp" lh="wc">
@@ -400,9 +413,9 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 				</vbox>
 
 				<vbox lw="mp" lh="wc" class="build_environment">
-					<TextView class="subtitle" text="@string(build_environment, Build Environment)" />
+					<TextView class="subtitle" text="@string(build_environment, Build Environment)" focusable="false" />
 					<CheckBox id="clear_sys_env" text="@string(clear_system_enviroment, Clear System Environment)" />
-					<TextView class="subtitle" text="@string(custom_environment_variables, Custom Environment Variables)" />
+					<TextView class="subtitle" text="@string(custom_environment_variables, Custom Environment Variables)" focusable="false" />
 					<hbox lw="mp" lh="wc">
 						<TableView id="table_envs" lw="0" lw8="1" lh="150dp" />
 						<vbox lw="wc" lh="mp" class="buttons_box">
@@ -413,15 +426,15 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 				</vbox>
 
 				<vbox lw="mp" lh="wc" class="output_parser">
-					<TextView class="subtitle" text="@string(output_parser, Output Parser)" />
-					<TextView lw="mp" lh="wc" word-wrap="true" text="@string(output_parser_desc, Custom output parsers scan command line output for user-provided error patterns to create entries in Build Issues and highlight those errors on the Build Output)" />
-					<TextView lw="mp" lh="wc" word-wrap="true" text='@string(output_parser_preset, "Presets are provided as generic output parsers, you can select one below, by default a \"generic\" preset will be selected:")' />
+					<TextView class="subtitle" text="@string(output_parser, Output Parser)" focusable="false" />
+					<TextView lw="mp" lh="wc" word-wrap="true" text="@string(output_parser_desc, Custom output parsers scan command line output for user-provided error patterns to create entries in Build Issues and highlight those errors on the Build Output)" focusable="false" />
+					<TextView lw="mp" lh="wc" word-wrap="true" text='@string(output_parser_preset, "Presets are provided as generic output parsers, you can select one below, by default a \"generic\" preset will be selected:")' focusable="false" />
 					<DropDownList id="output_parsers_presets_list" layout_width="200dp" layout_height="wc">
 						<item></item>
 						<item>generic</item>
 					</DropDownList>
 					<hbox lw="mp" lh="wc">
-						<TableView id="table_output_parsers" lw="0" lw8="1" lh="150dp" />
+						<TableView id="table_output_parsers" lw="0" lw8="1" lh="150dp" focusable="false" />
 						<vbox lw="wc" lh="mp" class="buttons_box">
 							<PushButton id="custom_op_add" icon="icon(add, 12dp)" min-width="20dp" tooltip="@string(add_custom_output_parser, Add Custom Output Parser)" lg="center" />
 							<PushButton id="custom_op_edit" icon="icon(file-edit, 12dp)" min-width="20dp" tooltip="@string(edit_custom_output_parser, Edit Selected Custom Output Parser)" lg="center" />
@@ -434,7 +447,7 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 
 		</vbox>
 
-		<TextView class="build_settings_clarification span" word-wrap="true" lw="mp" lh="wc" text='@string(build_settings_save_clarification, * All changes are automatically saved)' />
+		<TextView class="build_settings_clarification span" word-wrap="true" lw="mp" lh="wc" text='@string(build_settings_save_clarification, * All changes are automatically saved)' focusable="false" />
 	</vbox>
 </ScrollView>
 )xml";
@@ -527,8 +540,6 @@ UIBuildSettings::UIBuildSettings(
 			->setParent( buildCleanStepsParent );
 	} );
 
-	UIBuildStep::New( UIBuildStep::StepType::Run, this, 0, &mBuild.mRun )
-		->setParent( find( "run_step_cont" ) );
 
 	auto buildTypeDropDown = find<UIDropDownList>( "build_type_list" );
 	auto panelBuildTypeDDL = getUISceneNode()
@@ -701,6 +712,8 @@ UIBuildSettings::UIBuildSettings(
 			modelOP->invalidate();
 		}
 	} );
+
+	runSetup();
 }
 
 void UIBuildSettings::updateOS() {
@@ -801,7 +814,6 @@ void UIBuildSettings::deleteStep( size_t stepNum, bool isClean ) {
 		isClean ? find<UIWidget>( "build_clean_steps_cont" ) : find<UIWidget>( "build_steps_cont" );
 	for ( auto step = stepNum; step < steps.size(); step++ )
 		cont->findByClass<UIBuildStep>( String::toString( step ) )->clearBindings();
-	// cppcheck-suppress mismatchingContainerIterator
 	steps.erase( steps.begin() + stepNum );
 	cont->findByClass<UIBuildStep>( String::toString( stepNum ) )->close();
 	for ( auto step = stepNum + 1; step <= steps.size(); step++ )
@@ -809,4 +821,280 @@ void UIBuildSettings::deleteStep( size_t stepNum, bool isClean ) {
 			->updateStep( step - 1, &steps[step - 1] );
 }
 
+void UIBuildSettings::runSetup() {
+	if ( mBuild.mRun.empty() ) {
+		mBuild.mRun.push_back( {} );
+		mBuild.mRun.back().name = i18n( "custom_executable", "Custom Executable" );
+	}
+
+	UIBuildStep::New( UIBuildStep::StepType::Run, this, 0, &mBuild.mRun[runIndex()] )
+		->setParent( find( "run_cont" ) );
+
+	UIDropDownList* runList = find( "run_list" )->asType<UIDropDownList>();
+	auto panelRunListDDL = getUISceneNode()
+							   ->getRoot()
+							   ->querySelector( "#build_tab_view #run_config_list" )
+							   ->asType<UIDropDownList>();
+
+	runUpdate( true, runList, panelRunListDDL );
+
+	runList->getListBox()->setSelected( runIndex() );
+	if ( panelRunListDDL )
+		panelRunListDDL->getListBox()->setSelected( runIndex() );
+
+	runSelect( runIndex() );
+
+	runList->on( Event::OnItemSelected, [this, runList, panelRunListDDL]( auto ) {
+		mConfig.runName = runList->getListBox()->getItemSelectedText().toUtf8();
+		runSelect( runIndex() );
+		if ( panelRunListDDL )
+			panelRunListDDL->getListBox()->setSelected( mConfig.runName );
+	} );
+
+	if ( panelRunListDDL ) {
+		mCbs[panelRunListDDL].push_back( panelRunListDDL->on(
+			Event::OnItemSelected, [this, runList, panelRunListDDL]( const Event* ) {
+				mConfig.runName = panelRunListDDL->getListBox()->getItemSelectedText().toUtf8();
+				if ( runList )
+					runList->getListBox()->setSelected( mConfig.runName );
+			} ) );
+		mCbs[panelRunListDDL].push_back( panelRunListDDL->on(
+			Event::OnClose, [this, panelRunListDDL]( auto ) { mCbs.erase( panelRunListDDL ); } ) );
+	}
+
+	find( "run_add" )->onClick( [this, runList, panelRunListDDL]( auto ) {
+		UIMessageBox* msgBox = UIMessageBox::New(
+			UIMessageBox::INPUT, i18n( "run_configuration_name", "Run configuration name:" ) );
+		msgBox->setTitle( i18n( "run_settings", "Run Settings" ) );
+		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+		msgBox->showWhenReady();
+		msgBox->on( Event::OnConfirm, [this, msgBox, runList, panelRunListDDL]( auto ) {
+			bool unique = true;
+			auto newName = msgBox->getTextInput()->getText().toUtf8();
+			for ( const auto& run : mBuild.mRun ) {
+				if ( newName == run.name ) {
+					unique = false;
+					break;
+				}
+			}
+
+			if ( unique ) {
+				mBuild.mRun.push_back( {} );
+				mBuild.mRun.back().name = newName;
+
+				runList->getListBox()->addListBoxItem( newName );
+				runList->getListBox()->setSelected( newName );
+
+				if ( panelRunListDDL ) {
+					panelRunListDDL->getListBox()->addListBoxItem( newName );
+					panelRunListDDL->getListBox()->setSelected( newName );
+				}
+
+				runUpdate( false, runList, panelRunListDDL );
+			} else {
+				UIMessageBox* uniqueAlert = UIMessageBox::New(
+					UIMessageBox::OK, i18n( "run_configuration_name_must_be_unique",
+											"Run configuration name must be unique!" ) );
+				uniqueAlert->setTitle( i18n( "run_settings", "Run Settings" ) );
+				uniqueAlert->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+				uniqueAlert->showWhenReady();
+			}
+
+			msgBox->close();
+		} );
+	} );
+
+	find( "run_remove" )->onClick( [this, runList, panelRunListDDL]( auto ) {
+		UIMessageBox* msgBox = UIMessageBox::New(
+			UIMessageBox::OK_CANCEL,
+			i18n( "run_configuration_delete_confirm",
+				  "Are you sure you want to delete the currently selected run configuration?" ) );
+		msgBox->setTitle( i18n( "run_configuration", "Run Configuration" ) );
+		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+		msgBox->showWhenReady();
+		msgBox->on( Event::OnConfirm, [this, runList, panelRunListDDL]( auto ) {
+			runRemove( false, runList, panelRunListDDL );
+		} );
+	} );
+
+	find( "run_remove_all" )->onClick( [this, runList, panelRunListDDL]( auto ) {
+		UIMessageBox* msgBox = UIMessageBox::New(
+			UIMessageBox::OK_CANCEL,
+			i18n( "run_configuration_delete_all_confirm",
+				  "Are you sure you want to delete all the run configurations?" ) );
+		msgBox->setTitle( i18n( "run_configuration", "Run Configuration" ) );
+		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+		msgBox->showWhenReady();
+		msgBox->on( Event::OnConfirm, [this, runList, panelRunListDDL]( auto ) {
+			runRemove( true, runList, panelRunListDDL );
+		} );
+	} );
+
+	find( "run_rename" )->onClick( [this, runList, panelRunListDDL]( auto ) {
+		UIMessageBox* msgBox = UIMessageBox::New(
+			UIMessageBox::INPUT, i18n( "run_configuration_rename", "Rename configuration name:" ) );
+		msgBox->setTitle( i18n( "run_settings", "Run Settings" ) );
+		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+		msgBox->getTextInput()->setText( runList->getText() );
+		msgBox->getTextInput()->getDocument().selectAll();
+		msgBox->showWhenReady();
+		auto selectedIndex = runList->getListBox()->getItemSelectedIndex();
+		msgBox->on(
+			Event::OnConfirm, [this, msgBox, selectedIndex, runList, panelRunListDDL]( auto ) {
+				bool unique = true;
+				auto newName = msgBox->getTextInput()->getText().toUtf8();
+				for ( size_t i = 0; i < mBuild.mRun.size(); i++ ) {
+					const auto& run = mBuild.mRun[i];
+					if ( newName == run.name && i != selectedIndex ) {
+						unique = false;
+						break;
+					}
+				}
+
+				if ( unique && selectedIndex < mBuild.mRun.size() ) {
+					if ( mBuild.mRun[selectedIndex].name == mConfig.runName )
+						mConfig.runName = newName;
+					mBuild.mRun[selectedIndex].name = newName;
+					runList->getListBox()->setItemText( selectedIndex, newName );
+					if ( panelRunListDDL )
+						panelRunListDDL->getListBox()->setItemText( selectedIndex, newName );
+				} else {
+					UIMessageBox* uniqueAlert = UIMessageBox::New(
+						UIMessageBox::OK, i18n( "run_configuration_name_must_be_unique",
+												"Run configuration name must be unique!" ) );
+					uniqueAlert->setTitle( i18n( "run_settings", "Run Settings" ) );
+					uniqueAlert->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+					uniqueAlert->showWhenReady();
+				}
+
+				msgBox->close();
+			} );
+	} );
+
+	find( "run_clone" )->onClick( [this, runList, panelRunListDDL]( auto ) {
+		UIMessageBox* msgBox = UIMessageBox::New(
+			UIMessageBox::INPUT, i18n( "run_configuration_name", "Run configuration name:" ) );
+		msgBox->setTitle( i18n( "run_settings", "Run Settings" ) );
+		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+		msgBox->getTextInput()->setText( runList->getText() );
+		msgBox->getTextInput()->getDocument().selectAll();
+		msgBox->showWhenReady();
+		msgBox->on( Event::OnConfirm, [this, msgBox, runList, panelRunListDDL]( auto ) {
+			bool unique = true;
+			auto newName = msgBox->getTextInput()->getText().toUtf8();
+			for ( const auto& run : mBuild.mRun ) {
+				if ( newName == run.name ) {
+					unique = false;
+					break;
+				}
+			}
+
+			if ( unique ) {
+				auto selectedIndex = runList->getListBox()->getItemSelectedIndex();
+				if ( selectedIndex < mBuild.mRun.size() ) {
+					mBuild.mRun.push_back( mBuild.mRun[selectedIndex] );
+				} else {
+					mBuild.mRun.push_back( {} );
+				}
+				mBuild.mRun.back().name = newName;
+
+				runList->getListBox()->addListBoxItem( newName );
+				runList->getListBox()->setSelected( newName );
+				if ( panelRunListDDL ) {
+					panelRunListDDL->getListBox()->addListBoxItem( newName );
+					panelRunListDDL->getListBox()->setSelected( newName );
+				}
+			} else {
+				UIMessageBox* uniqueAlert = UIMessageBox::New(
+					UIMessageBox::OK, i18n( "run_configuration_name_must_be_unique",
+											"Run configuration name must be unique!" ) );
+				uniqueAlert->setTitle( i18n( "run_settings", "Run Settings" ) );
+				uniqueAlert->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
+				uniqueAlert->showWhenReady();
+			}
+
+			msgBox->close();
+		} );
+	} );
+}
+
+void UIBuildSettings::runSelect( Uint32 index ) {
+	UIWidget* cont = find<UIWidget>( "run_cont" );
+	auto bs = cont->findByClass<UIBuildStep>( String::toString( 0 ) );
+	if ( index < mBuild.mRun.size() ) {
+		bs->updateStep( 0, &mBuild.mRun[index] );
+	} else {
+		if ( mBuild.mRun.empty() ) {
+			mBuild.mRun.push_back( {} );
+			mBuild.mRun.back().name = i18n( "custom_executable", "Custom Executable" );
+		}
+		bs->updateStep( 0, &mBuild.mRun[0] );
+	}
+}
+
+void UIBuildSettings::runRemove( bool all, UIDropDownList* runList,
+								 UIDropDownList* panelRunListDDL ) {
+
+	if ( runList->getListBox()->isEmpty() )
+		return;
+
+	if ( all ) {
+		runList->getListBox()->clear();
+		if ( panelRunListDDL )
+			panelRunListDDL->getListBox()->clear();
+		mBuild.mRun.clear();
+	} else {
+		auto name = runList->getListBox()->getItemSelectedText();
+		mBuild.mRun.erase( mBuild.mRun.begin() + runList->getListBox()->getItemSelectedIndex() );
+		runList->getListBox()->removeListBoxItem( name );
+		if ( panelRunListDDL )
+			panelRunListDDL->getListBox()->removeListBoxItem( name );
+	}
+
+	runUpdate( false, runList, panelRunListDDL );
+
+	if ( all )
+		runSelect();
+}
+
+void UIBuildSettings::runUpdate( bool recreateList, UIDropDownList* runList,
+								 UIDropDownList* panelRunListDDL ) {
+	if ( recreateList ) {
+		runList->getListBox()->clear();
+		if ( panelRunListDDL )
+			panelRunListDDL->getListBox()->clear();
+
+		size_t i = 1;
+		for ( const auto& run : mBuild.mRun ) {
+			auto name =
+				run.name.empty()
+					? String::format(
+						  i18n( "custom_executable_num", "Custom Executable %d" ).toUtf8(), i )
+					: run.name;
+			runList->getListBox()->addListBoxItem( name );
+			if ( panelRunListDDL )
+				panelRunListDDL->getListBox()->addListBoxItem( name );
+			i++;
+		}
+	}
+
+	bool runButEnabled = !runList->getListBox()->isEmpty();
+	runList->setEnabled( runButEnabled );
+	if ( panelRunListDDL )
+		panelRunListDDL->setEnabled( runButEnabled );
+	find( "run_cont" )->setEnabled( runButEnabled )->setVisible( runButEnabled );
+	find( "run_remove" )->setEnabled( runButEnabled );
+	find( "run_remove_all" )->setEnabled( runButEnabled );
+	find( "run_rename" )->setEnabled( runButEnabled );
+	find( "run_clone" )->setEnabled( runButEnabled );
+}
+
+Uint32 UIBuildSettings::runIndex() const {
+	for ( size_t i = 0; i < mBuild.mRun.size(); i++ ) {
+		if ( mBuild.mRun[i].name == mConfig.runName )
+			return i;
+	}
+	return 0;
+}
+
 } // namespace ecode
diff --git a/src/tools/ecode/uibuildsettings.hpp b/src/tools/ecode/uibuildsettings.hpp
index 5b33c212c..326f561ec 100644
--- a/src/tools/ecode/uibuildsettings.hpp
+++ b/src/tools/ecode/uibuildsettings.hpp
@@ -5,6 +5,9 @@
 #include <eepp/ui/uidatabind.hpp>
 #include <eepp/ui/uirelativelayout.hpp>
 
+namespace EE { namespace UI {
+class UIDropDownList;
+}} // namespace EE::UI
 using namespace EE::UI;
 
 namespace ecode {
@@ -52,6 +55,16 @@ class UIBuildSettings : public UIRelativeLayout {
 	void refreshTab();
 
 	void bindTable( const std::string& name, const std::string& key, ProjectBuildKeyVal& data );
+
+	void runSelect( Uint32 index = 0xFFFFFFFF );
+
+	void runRemove( bool all, UIDropDownList* runList, UIDropDownList* panelRunListDDL );
+
+	void runUpdate( bool recreateList, UIDropDownList* runList, UIDropDownList* panelRunListDDL );
+
+	Uint32 runIndex() const;
+
+	void runSetup();
 };
 
 } // namespace ecode