diff --git a/bin/assets/ui/breeze.css b/bin/assets/ui/breeze.css
index 5344709a2..5d84bfa9a 100644
--- a/bin/assets/ui/breeze.css
+++ b/bin/assets/ui/breeze.css
@@ -1072,26 +1072,6 @@ TextInput.table_cell_edit {
 	padding-bottom: 0!important;
 }
 
-.font_theme_normal {
-	color: var(--font);
-}
-
-.font_theme_primary {
-	color: var(--primary);
-}
-
-.font_theme_success {
-	color: var(--theme-success);
-}
-
-.font_theme_warning {
-	color: var(--theme-warning);
-}
-
-.font_theme_font {
-	color: var(--theme-error);
-}
-
 @media (prefers-color-scheme: light) {
 
 :root {
diff --git a/include/eepp/ui/tools/uicodeeditorsplitter.hpp b/include/eepp/ui/tools/uicodeeditorsplitter.hpp
index e11a6ea35..559cebbe9 100644
--- a/include/eepp/ui/tools/uicodeeditorsplitter.hpp
+++ b/include/eepp/ui/tools/uicodeeditorsplitter.hpp
@@ -286,7 +286,7 @@ class EE_API UICodeEditorSplitter {
 		} );
 		for ( int i = 1; i <= 10; i++ )
 			t.setCommand( String::format( "switch-to-tab-%d", i ),
-						  [&, i] { switchToTab( i - 1 ); } );
+						  [this, i] { switchToTab( i - 1 ); } );
 		t.setCommand( "switch-to-first-tab", [this] {
 			UITabWidget* tabWidget = tabWidgetFromWidget( mCurWidget );
 			if ( tabWidget && tabWidget->getTabCount() ) {
diff --git a/premake5.lua b/premake5.lua
index a337017f2..8d7763c56 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1171,7 +1171,6 @@ workspace "eepp"
 		incdirs { "src/thirdparty/efsw/include", "src/thirdparty" }
 		links { "efsw-static", "pugixml-static" }
 		files { "src/tools/uieditor/*.cpp" }
-		eepp_module_maps_add()
 		build_link_configuration( "eepp-UIEditor", true )
 		filter "system:macosx"
 			links { "CoreFoundation.framework", "CoreServices.framework" }
diff --git a/src/eepp/ui/abstract/uiabstracttableview.cpp b/src/eepp/ui/abstract/uiabstracttableview.cpp
index b8012ff56..d63a05836 100644
--- a/src/eepp/ui/abstract/uiabstracttableview.cpp
+++ b/src/eepp/ui/abstract/uiabstracttableview.cpp
@@ -92,7 +92,7 @@ void UIAbstractTableView::onModelUpdate( unsigned flags ) {
 		static constexpr String::HashType tag = String::hash( "onModelUpdate" );
 		removeActionsByTag( tag );
 		runOnMainThread(
-			[&, flags] {
+			[this, flags] {
 				modelUpdate( flags );
 				createOrUpdateColumns( true );
 			},
diff --git a/src/eepp/ui/abstract/uiabstractview.cpp b/src/eepp/ui/abstract/uiabstractview.cpp
index 421f75685..25740e783 100644
--- a/src/eepp/ui/abstract/uiabstractview.cpp
+++ b/src/eepp/ui/abstract/uiabstractview.cpp
@@ -137,7 +137,7 @@ void UIAbstractView::onModelUpdate( unsigned flags ) {
 	if ( !Engine::instance()->isMainThread() ) {
 		static constexpr String::HashType tag = String::hash( "onModelUpdate" );
 		removeActionsByTag( tag );
-		runOnMainThread( [&, flags] { modelUpdate( flags ); }, Time::Zero, tag );
+		runOnMainThread( [this, flags] { modelUpdate( flags ); }, Time::Zero, tag );
 	} else {
 		modelUpdate( flags );
 	}
diff --git a/src/eepp/ui/tools/uicodeeditorsplitter.cpp b/src/eepp/ui/tools/uicodeeditorsplitter.cpp
index 82f31af4e..d63e76980 100644
--- a/src/eepp/ui/tools/uicodeeditorsplitter.cpp
+++ b/src/eepp/ui/tools/uicodeeditorsplitter.cpp
@@ -370,7 +370,7 @@ bool UICodeEditorSplitter::loadFileFromPath( const std::string& path, UICodeEdit
 	bool isUrl = String::startsWith( path, "https://" ) || String::startsWith( path, "http://" );
 	bool ret = isUrl ? codeEditor->loadAsyncFromURL(
 						   path, Http::Request::FieldTable(),
-						   [&, codeEditor, path]( std::shared_ptr<TextDocument>, bool ) {
+						   [this, codeEditor, path]( std::shared_ptr<TextDocument>, bool ) {
 							   mClient->onDocumentLoaded( codeEditor, path );
 						   } )
 					 : codeEditor->loadFromFile( path ) == TextDocument::LoadStatus::Loaded;
@@ -400,7 +400,7 @@ void UICodeEditorSplitter::loadAsyncFileFromPath(
 	if ( isUrl ) {
 		codeEditor->loadAsyncFromURL(
 			path, Http::Request::FieldTable(),
-			[&, codeEditor, path, onLoaded]( std::shared_ptr<TextDocument>, bool ) {
+			[this, codeEditor, path, onLoaded]( std::shared_ptr<TextDocument>, bool ) {
 				mClient->onDocumentLoaded( codeEditor, path );
 				if ( onLoaded )
 					onLoaded( codeEditor, path );
@@ -408,7 +408,7 @@ void UICodeEditorSplitter::loadAsyncFileFromPath(
 	} else {
 		codeEditor->loadAsyncFromFile(
 			path, mThreadPool,
-			[&, codeEditor, path, onLoaded]( std::shared_ptr<TextDocument>, bool ) {
+			[this, codeEditor, path, onLoaded]( std::shared_ptr<TextDocument>, bool ) {
 				mClient->onDocumentLoaded( codeEditor, path );
 				if ( onLoaded )
 					onLoaded( codeEditor, path );
@@ -734,7 +734,7 @@ UICodeEditor* UICodeEditorSplitter::editorFromTab( UITab* tab ) const {
 
 UICodeEditor* UICodeEditorSplitter::findEditorFromPath( const std::string& path ) {
 	UICodeEditor* editor = nullptr;
-	forEachEditorStoppable( [&, path]( UICodeEditor* curEditor ) -> bool {
+	forEachEditorStoppable( [&]( UICodeEditor* curEditor ) -> bool {
 		if ( curEditor->getDocument().getFilePath() == path ) {
 			editor = curEditor;
 			return true;
@@ -808,7 +808,8 @@ void UICodeEditorSplitter::forEachEditor( std::function<void( UICodeEditor* )> r
 
 void UICodeEditorSplitter::forEachDoc( std::function<void( TextDocument& )> run ) const {
 	std::unordered_set<TextDocument*> docs;
-	forEachEditor( [&]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef().get() ); } );
+	forEachEditor(
+		[&docs]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef().get() ); } );
 	for ( auto doc : docs )
 		run( *doc );
 }
@@ -867,7 +868,7 @@ void UICodeEditorSplitter::forEachDocStoppable( std::function<bool( TextDocument
 
 std::shared_ptr<TextDocument> UICodeEditorSplitter::findDocFromURI( const URI& uri ) {
 	std::unordered_set<std::shared_ptr<TextDocument>> docs;
-	forEachEditor( [&]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef() ); } );
+	forEachEditor( [&docs]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef() ); } );
 	for ( const auto& doc : docs ) {
 		if ( doc->getURI() == uri )
 			return doc;
@@ -877,7 +878,7 @@ std::shared_ptr<TextDocument> UICodeEditorSplitter::findDocFromURI( const URI& u
 
 std::shared_ptr<TextDocument> UICodeEditorSplitter::findDocFromPath( const std::string& path ) {
 	std::unordered_set<std::shared_ptr<TextDocument>> docs;
-	forEachEditor( [&]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef() ); } );
+	forEachEditor( [&docs]( UICodeEditor* editor ) { docs.insert( editor->getDocumentRef() ); } );
 	for ( const auto& doc : docs ) {
 		if ( doc->getFilePath() == path )
 			return doc;
@@ -912,7 +913,7 @@ UIWidget* UICodeEditorSplitter::getCurWidget() const {
 
 std::vector<UICodeEditor*> UICodeEditorSplitter::getAllEditors() {
 	std::vector<UICodeEditor*> editors;
-	forEachEditor( [&]( UICodeEditor* editor ) { editors.push_back( editor ); } );
+	forEachEditor( [&editors]( UICodeEditor* editor ) { editors.push_back( editor ); } );
 	return editors;
 }
 
diff --git a/src/eepp/ui/tools/uidocfindreplace.cpp b/src/eepp/ui/tools/uidocfindreplace.cpp
index 1d5d803fd..6a23ecda7 100644
--- a/src/eepp/ui/tools/uidocfindreplace.cpp
+++ b/src/eepp/ui/tools/uidocfindreplace.cpp
@@ -202,7 +202,7 @@ UIDocFindReplace::UIDocFindReplace( UIWidget* parent, const std::shared_ptr<Doc:
 		getParent()->isType( UI_TYPE_CODEEDITOR ) ? getParent()->asType<UICodeEditor>() : nullptr;
 
 	mFindInput->addEventListener( Event::OnTextChanged,
-								  [&, editor]( const Event* ) { refreshHighlight( editor ); } );
+								  [this, editor]( const Event* ) { refreshHighlight( editor ); } );
 	mFindInput->addEventListener( Event::OnTextPasted, [this]( const Event* ) {
 		if ( mFindInput->getUISceneNode()->getWindow()->getClipboard()->getText().find( '\n' ) !=
 			 String::InvalidPos ) {
@@ -258,7 +258,7 @@ UIDocFindReplace::UIDocFindReplace( UIWidget* parent, const std::shared_ptr<Doc:
 		if ( !widget )
 			return;
 		widget->setTooltipText( getKeyBindings().getCommandKeybindString( cmd ) );
-		widget->addEventListener( Event::MouseClick, [&, cmd]( const Event* event ) {
+		widget->addEventListener( Event::MouseClick, [this, cmd]( const Event* event ) {
 			const MouseEvent* mouseEvent = static_cast<const MouseEvent*>( event );
 			if ( mouseEvent->getFlags() & EE_BUTTON_LMASK )
 				execute( cmd );
diff --git a/src/eepp/ui/tools/uiwidgetinspector.cpp b/src/eepp/ui/tools/uiwidgetinspector.cpp
index a05e773b6..a2386bfcd 100644
--- a/src/eepp/ui/tools/uiwidgetinspector.cpp
+++ b/src/eepp/ui/tools/uiwidgetinspector.cpp
@@ -72,7 +72,7 @@ UIWindow* UIWidgetInspector::create( UISceneNode* sceneNode, const Float& menuIc
 	UITableView* tableView = cont->findByType<UITableView>( UI_TYPE_TABLEVIEW );
 	tableView->setAutoColumnsWidth( true );
 	tableView->setHeadersVisible( true );
-	widgetTree->setOnSelection( [&, tableView]( const ModelIndex& index ) {
+	widgetTree->setOnSelection( [tableView]( const ModelIndex& index ) {
 		Node* node = static_cast<Node*>( index.internalData() );
 		if ( node->isWidget() ) {
 			tableView->setModel( node->isWidget()
@@ -150,7 +150,7 @@ UIWindow* UIWidgetInspector::create( UISceneNode* sceneNode, const Float& menuIc
 
 	uiWin->center();
 
-	Uint32 winCb = sceneNode->addEventListener( Event::OnWindowAdded, [&, sceneNode, uiWin](
+	Uint32 winCb = sceneNode->addEventListener( Event::OnWindowAdded, [sceneNode, uiWin](
 																		  const Event* event ) {
 		UIWindow* eWin = event->asWindowEvent()->getWindow()->asType<UIWindow>();
 		if ( eWin != uiWin ) {
diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index 3c9fe7669..b3bce44af 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -457,7 +457,7 @@ bool UICodeEditor::loadAsyncFromFile(
 	bool ret = mDoc->loadAsyncFromFile(
 		path, pool, [this, onLoaded, wasLocked]( TextDocument*, bool success ) {
 			if ( !success ) {
-				runOnMainThread( [&, onLoaded, wasLocked, success] {
+				runOnMainThread( [this, onLoaded, wasLocked, success] {
 					if ( !wasLocked )
 						setLocked( false );
 					if ( onLoaded )
@@ -470,7 +470,7 @@ bool UICodeEditor::loadAsyncFromFile(
 					runOnMainThread( [this] { invalidateDraw(); } );
 				} );
 			}
-			runOnMainThread( [&, onLoaded, wasLocked, success] {
+			runOnMainThread( [this, onLoaded, wasLocked, success] {
 				invalidateEditor();
 				invalidateDraw();
 				if ( !wasLocked )
@@ -510,7 +510,7 @@ bool UICodeEditor::loadAsyncFromURL(
 				mDoc->getHighlighter()->tokenizeAsync( getUISceneNode()->getThreadPool(), [this] {
 					runOnMainThread( [this] { invalidateDraw(); } );
 				} );
-			runOnMainThread( [&, onLoaded, wasLocked] {
+			runOnMainThread( [this, success, onLoaded, wasLocked] {
 				invalidateEditor();
 				updateLongestLineWidth();
 				invalidateDraw();
@@ -1484,7 +1484,7 @@ void UICodeEditor::checkColorPickerAction() {
 				TextDocument::MatchDirection::Forward );
 			if ( position.isValid() ) {
 				mDoc->setSelection( { position.line(), position.column() + 1 }, range.start() );
-				colorPicker = UIColorPicker::NewModal( this, [&, isRgba]( Color color ) {
+				colorPicker = UIColorPicker::NewModal( this, [this, isRgba]( Color color ) {
 					mDoc->replaceSelection( isRgba || color.a != 255 ? color.toRgbaString()
 																	 : color.toRgbString() );
 				} );
diff --git a/src/eepp/ui/uiconsole.cpp b/src/eepp/ui/uiconsole.cpp
index 79151bb05..45b721356 100644
--- a/src/eepp/ui/uiconsole.cpp
+++ b/src/eepp/ui/uiconsole.cpp
@@ -1218,7 +1218,7 @@ bool UIConsole::onCreateContextMenu( const Vector2i& position, const Uint32& fla
 	}
 
 	menu->setCloseOnHide( true );
-	menu->addEventListener( Event::OnItemClicked, [&, menu]( const Event* event ) {
+	menu->addEventListener( Event::OnItemClicked, [this, menu]( const Event* event ) {
 		if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) )
 			return;
 		UIMenuItem* item = event->getNode()->asType<UIMenuItem>();
diff --git a/src/eepp/ui/uimenubar.cpp b/src/eepp/ui/uimenubar.cpp
index 594c92a65..44743fc6e 100644
--- a/src/eepp/ui/uimenubar.cpp
+++ b/src/eepp/ui/uimenubar.cpp
@@ -56,7 +56,7 @@ void UIMenuBar::addMenuButton( const String& buttonText, UIPopUpMenu* menu ) {
 	button->setVisible( true );
 	button->setEnabled( true );
 	button->addEventListener( Event::OnSizeChange, [this]( const Event* ) { refreshButtons(); } );
-	button->addEventListener( Event::OnFocus, [&, button]( const Event* ) {
+	button->addEventListener( Event::OnFocus, [this, button]( const Event* ) {
 		if ( getEventDispatcher()->getReleaseTrigger() & EE_BUTTON_LMASK ) {
 			getMenuFromButton( button )->setFocus();
 		}
@@ -67,7 +67,7 @@ void UIMenuBar::addMenuButton( const String& buttonText, UIPopUpMenu* menu ) {
 	menu->setOwnerNode( button );
 	// This will force to change the parent when shown, and force the CSS style reload.
 	menu->setParent( this );
-	menu->addEventListener( Event::OnVisibleChange, [&, button]( const Event* event ) {
+	menu->addEventListener( Event::OnVisibleChange, [this, button]( const Event* event ) {
 		if ( event->getNode()->isVisible() ) {
 			button->select();
 			mCurrentMenu = event->getNode()->asType<UIPopUpMenu>();
diff --git a/src/eepp/ui/uitreeview.cpp b/src/eepp/ui/uitreeview.cpp
index 58d535a44..4875f44a0 100644
--- a/src/eepp/ui/uitreeview.cpp
+++ b/src/eepp/ui/uitreeview.cpp
@@ -418,8 +418,8 @@ Node* UITreeView::overFind( const Vector2f& point ) {
 				return pOver;
 			int realIndex = 0;
 			Float rowHeight = getRowHeight();
-			traverseTree( [&, point, rowHeight]( int, const ModelIndex& index, const size_t&,
-												 const Float& yOffset ) {
+			traverseTree( [this, &pOver, &realIndex, point, rowHeight](
+							  int, const ModelIndex& index, const size_t&, const Float& yOffset ) {
 				if ( yOffset - mScrollOffset.y > mSize.getHeight() )
 					return IterationDecision::Stop;
 				if ( yOffset - mScrollOffset.y + rowHeight < 0 )
@@ -526,8 +526,8 @@ Float UITreeView::getMaxColumnContentWidth( const size_t& colIndex, bool ) {
 	Float lWidth = 0;
 	ScopedOp op( [this] { mUISceneNode->setIsLoading( true ); },
 				 [this] { mUISceneNode->setIsLoading( false ); } );
-	traverseTree( [&, colIndex]( const int&, const ModelIndex& index, const size_t& indentLevel,
-								 const Float& yOffset ) {
+	traverseTree( [this, &lWidth, colIndex]( const int&, const ModelIndex& index,
+											 const size_t& indentLevel, const Float& yOffset ) {
 		UIWidget* widget = updateCell( { (Int64)0, (Int64)0 },
 									   getModel()->index( index.row(), colIndex, index.parent() ),
 									   indentLevel, yOffset );
@@ -782,7 +782,8 @@ ModelIndex UITreeView::selectRowWithPath( std::string path ) {
 		const auto& part = pathPart[i];
 
 		traverseTree(
-			[&, i]( const int&, const ModelIndex& index, const size_t& indentLevel, const Float& ) {
+			[&model, &foundIndex, &part, &parentIndex,
+			 i]( const int&, const ModelIndex& index, const size_t& indentLevel, const Float& ) {
 				Variant var = model->data( index );
 				if ( i == indentLevel && var.isValid() && var.toString() == part ) {
 					if ( !parentIndex.isValid() || parentIndex == index.parent() ) {
diff --git a/src/examples/7guis/cells/cells.cpp b/src/examples/7guis/cells/cells.cpp
index 4363ff61b..3acb05257 100644
--- a/src/examples/7guis/cells/cells.cpp
+++ b/src/examples/7guis/cells/cells.cpp
@@ -6,6 +6,10 @@ EE_MAIN_FUNC int main( int, char** ) {
 	UIApplication app( { 1024, 768, "eepp - 7GUIs - Cells" } );
 	UIWidget* rlay = app.getUI()->loadLayoutFromString( R"xml(
 	<style>
+		.font_theme_normal { color: var(--font); }
+		.font_theme_success { color: var(--theme-success); }
+		.font_theme_warning { color: var(--theme-warning); }
+		.font_theme_error { color: var(--theme-error); }
 		#sheet tableview::cell {
 			border-type: inside;
 			border-right: 1dprd solid var(--button-border);
diff --git a/src/examples/7guis/cells/formula.cpp b/src/examples/7guis/cells/formula.cpp
index 72be16507..8bccdca07 100644
--- a/src/examples/7guis/cells/formula.cpp
+++ b/src/examples/7guis/cells/formula.cpp
@@ -48,12 +48,20 @@ void SheetFunction::initOpTable() {
 							 tot *= val;
 						 return tot;
 					 } } );
+	opTable.insert( { String::hash( "AVG" ), []( const std::vector<double>& vals ) {
+						 double tot = 0;
+						 for ( const auto& val : vals )
+							 tot += val;
+						 return vals.empty() ? 0 : tot / vals.size();
+					 } } );
 }
 
 std::vector<double> SheetFunction::evalList( const std::vector<std::shared_ptr<Formula>>& args,
 											 Spreadsheet& env ) {
 	std::vector<double> result;
 	for ( const auto& f : args ) {
+		if ( !f )
+			return result;
 		if ( f->type() == FormulaType::RangeReference ) {
 			auto refs( f->getReferences( env ) );
 			for ( Cell* c : refs ) {
@@ -82,6 +90,8 @@ std::optional<double> SheetFunction::eval( Spreadsheet& env ) const {
 std::vector<Cell*> SheetFunction::getReferences( Spreadsheet& env ) const {
 	std::vector<Cell*> result;
 	for ( const auto& argument : arguments ) {
+		if ( !argument )
+			continue;
 		auto refs( argument->getReferences( env ) );
 		result.insert( result.end(), refs.begin(), refs.end() );
 	}
diff --git a/src/examples/7guis/cells/spreadsheet.cpp b/src/examples/7guis/cells/spreadsheet.cpp
index 5b2e6a5ca..06365fb82 100644
--- a/src/examples/7guis/cells/spreadsheet.cpp
+++ b/src/examples/7guis/cells/spreadsheet.cpp
@@ -50,8 +50,13 @@ const std::string& Cell::getDisplayValue() const {
 void Cell::calc() {
 	auto oldDisplayValue = displayValue;
 
-	if ( !hasFormula() ) {
+	if ( !hasFormula() && !value.empty() && value[0] == '=' ) {
+		displayValue = "!ERR";
+		formulaContainsErrors = true;
+		return;
+	} else if ( !hasFormula() ) {
 		displayValue = value;
+		formulaContainsErrors = false;
 		return;
 	}
 
@@ -61,6 +66,8 @@ void Cell::calc() {
 	else
 		displayValue = "!ERR";
 
+	formulaContainsErrors = res ? false : true;
+
 	if ( oldDisplayValue != displayValue )
 		setChanged();
 }
@@ -86,6 +93,7 @@ Variant Spreadsheet::data( const ModelIndex& index, ModelRole role ) const {
 	static const char* STYLE_NONE = "font_theme_normal";
 	static const char* FORMULA_STYLE = "font_theme_success";
 	static const char* NUMBER_STYLE = "font_theme_warning";
+	static const char* ERROR_STYLE = "font_theme_error";
 	switch ( role ) {
 		case ModelRole::Display:
 			if ( nullptr == mCells[index.column()][index.row()] )
@@ -98,6 +106,8 @@ Variant Spreadsheet::data( const ModelIndex& index, ModelRole role ) const {
 		}
 		case ModelRole::Class: {
 			const auto& cell = mCells[index.column()][index.row()];
+			if ( cell && cell->hasErrors() )
+				return Variant( ERROR_STYLE );
 			if ( cell && cell->hasFormula() ) { // Let's give it some style
 				switch ( cell->getFormula()->type() ) {
 					case FormulaType::CellReference:
diff --git a/src/examples/7guis/cells/spreadsheet.hpp b/src/examples/7guis/cells/spreadsheet.hpp
index e7685061e..935b17941 100644
--- a/src/examples/7guis/cells/spreadsheet.hpp
+++ b/src/examples/7guis/cells/spreadsheet.hpp
@@ -62,6 +62,8 @@ class Cell : public Observer, public Observable {
 
 	bool hasFormula() const;
 
+	bool hasErrors() const { return formulaContainsErrors; }
+
 	const std::shared_ptr<Formula>& getFormula() const { return this->formula; }
 
   protected:
@@ -69,6 +71,7 @@ class Cell : public Observer, public Observable {
 	std::string displayValue;
 	std::shared_ptr<Formula> formula;
 	Spreadsheet& sheet;
+	bool formulaContainsErrors{ false };
 
 	void parseFormula( const std::string& formulaStr );
 };
diff --git a/src/tests/test_all/test.cpp b/src/tests/test_all/test.cpp
index 5d24cd56c..36f52b75b 100644
--- a/src/tests/test_all/test.cpp
+++ b/src/tests/test_all/test.cpp
@@ -738,7 +738,7 @@ void EETest::createNewUI() {
 	pushButton->setPosition( 50, 560 )->setSize( 200, 0 )->setParent( container );
 	pushButton->setText( "PushButton" );
 	pushButton->setIcon( mSceneNode->findIconDrawable( "ok", PixelDensity::dpToPxI( 16 ) ) );
-	pushButton->addEventListener( Event::MouseClick, [&, pushButton]( const Event* event ) {
+	pushButton->addEventListener( Event::MouseClick, [this, pushButton]( const Event* event ) {
 		if ( static_cast<const MouseEvent*>( event )->getFlags() & EE_BUTTON_LMASK )
 			createColorPicker( pushButton );
 	} );
@@ -1154,7 +1154,7 @@ void EETest::createDecoratedWindow() {
 	TEdit->setFlags( UI_WORD_WRAP );
 	TEdit->setParent( TabWidget );
 	TEdit->addEventListener( Event::OnSizeChange,
-							 [&, TEdit]( const Event* ) { TEdit->setText( mBuda ); } );
+							 [this, TEdit]( const Event* ) { TEdit->setText( mBuda ); } );
 	TabWidget->add( "TextEdit", TEdit );
 
 	UITextInput* Txt = UITextInput::New();
diff --git a/src/tools/ecode/appconfig.cpp b/src/tools/ecode/appconfig.cpp
index 83431ed4e..b61a67173 100644
--- a/src/tools/ecode/appconfig.cpp
+++ b/src/tools/ecode/appconfig.cpp
@@ -159,7 +159,7 @@ void AppConfig::load( const std::string& confPath, std::string& keybindingsPath,
 
 	workspace.restoreLastSession = ini.getValueB( "workspace", "restore_last_session", false );
 	workspace.checkForUpdatesAtStartup =
-		ini.getValueB( "workspace", "check_for_updates_at_startup", false );
+		ini.getValueB( "workspace", "check_for_updates_at_startup", true );
 
 	std::map<std::string, bool> pluginsEnabled;
 	const auto& creators = pluginManager->getDefinitions();
diff --git a/src/tools/ecode/appconfig.hpp b/src/tools/ecode/appconfig.hpp
index e5a724f18..252b959db 100644
--- a/src/tools/ecode/appconfig.hpp
+++ b/src/tools/ecode/appconfig.hpp
@@ -154,7 +154,7 @@ struct TerminalConfig {
 
 struct WorkspaceConfig {
 	bool restoreLastSession{ false };
-	bool checkForUpdatesAtStartup{ false };
+	bool checkForUpdatesAtStartup{ true };
 };
 
 struct LanguagesExtensions {
diff --git a/src/tools/ecode/commandpalette.cpp b/src/tools/ecode/commandpalette.cpp
index fdee2383c..a153e37dd 100644
--- a/src/tools/ecode/commandpalette.cpp
+++ b/src/tools/ecode/commandpalette.cpp
@@ -93,7 +93,7 @@ void CommandPalette::asyncFuzzyMatch( const std::string& match, const size_t& ma
 	if ( !mCurModel )
 		return;
 
-	mPool->run( [&, match, max, res]() {
+	mPool->run( [this, match, max, res]() {
 		const std::vector<std::vector<std::string>>& cmdPalette =
 			mCurModel.get() == mBaseModel.get() ? mCommandPalette : mCommandPaletteEditor;
 		res( fuzzyMatch( cmdPalette, match, max ) );
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 7854baaad..f1468ea0d 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -116,12 +116,12 @@ void App::saveAllProcess() {
 				mTmpDocs.erase( &editor->getDocument() );
 			} else {
 				UIFileDialog* dialog = saveFileDialog( editor, false );
-				dialog->on( Event::SaveFile, [&, editor]( const Event* ) {
+				dialog->on( Event::SaveFile, [this, editor]( const Event* ) {
 					updateEditorTabTitle( editor );
 					if ( mSplitter->getCurEditor() == editor )
 						updateEditorTitle( editor );
 				} );
-				dialog->on( Event::OnWindowClose, [&, editor]( const Event* ) {
+				dialog->on( Event::OnWindowClose, [this, editor]( const Event* ) {
 					mTmpDocs.erase( &editor->getDocument() );
 					if ( !SceneManager::instance()->isShuttingDown() && !mTmpDocs.empty() )
 						saveAllProcess();
@@ -273,7 +273,7 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
 		FileSystem::fileNameFromPath( fontPath ), true, true );
 	if ( index.isValid() )
 		dialog->runOnMainThread(
-			[&, dialog, index]() { dialog->getMultiView()->setSelection( index ); } );
+			[dialog, index]() { dialog->getMultiView()->setSelection( index ); } );
 	dialog->setWindowFlags( UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL );
 	dialog->setTitle( i18n( "select_font_file", "Select Font File" ) );
 	dialog->setCloseShortcut( KEY_ESCAPE );
@@ -281,7 +281,7 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
 		if ( mSplitter && mSplitter->getCurWidget() && !SceneManager::instance()->isShuttingDown() )
 			mSplitter->getCurWidget()->setFocus();
 	} );
-	dialog->on( Event::OpenFile, [&, loadingMonoFont]( const Event* event ) {
+	dialog->on( Event::OpenFile, [this, &fontPath, loadingMonoFont]( const Event* event ) {
 		auto newPath = event->getNode()->asType<UIFileDialog>()->getFullPath();
 		if ( String::startsWith( newPath, mResPath ) )
 			newPath = newPath.substr( mResPath.size() );
@@ -294,7 +294,7 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
 				FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( newPath ) );
 			FontTrueType* fontMono = loadFont( fontName, newPath );
 			if ( fontMono ) {
-				auto loadMonoFont = [&, newPath]( FontTrueType* fontMono ) {
+				auto loadMonoFont = [this, &fontPath, newPath]( FontTrueType* fontMono ) {
 					fontPath = newPath;
 					mFontMono = fontMono;
 					mFontMono->setEnableDynamicMonospace( true );
@@ -314,7 +314,7 @@ void App::openFontDialog( std::string& fontPath, bool loadingMonoFont ) {
 							"flagged as monospace.\nDo you want to load it anyways?\nPerformance "
 							"and memory usage will be awful without a monospaced font." )
 							.unescape() );
-					msgBox->on( Event::OnConfirm, [&, loadMonoFont, fontMono]( const Event* ) {
+					msgBox->on( Event::OnConfirm, [loadMonoFont, fontMono]( const Event* ) {
 						loadMonoFont( fontMono );
 					} );
 					msgBox->on( Event::OnCancel, [fontMono]( const Event* ) {
@@ -342,7 +342,7 @@ void App::downloadFileWebDialog() {
 	msgBox->getTextInput()->setHint( i18n( "any_https_or_http_url", "Any https or http URL" ) );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		std::string url( msgBox->getTextInput()->getText().toUtf8() );
 		downloadFileWeb( url );
 		if ( mSplitter->getCurWidget() )
@@ -367,7 +367,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) {
 	if ( FileSystem::fileExtension( editor->getDocument().getFilename() ).empty() )
 		filename += editor->getSyntaxDefinition().getFileExtension();
 	dialog->setFileName( filename );
-	dialog->on( Event::SaveFile, [&, editor]( const Event* event ) {
+	dialog->on( Event::SaveFile, [this, editor]( const Event* event ) {
 		if ( editor ) {
 			std::string path( event->getNode()->asType<UIFileDialog>()->getFullPath() );
 			if ( !path.empty() && !FileSystem::isDirectory( path ) &&
@@ -391,7 +391,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) {
 		}
 	} );
 	if ( focusOnClose ) {
-		dialog->on( Event::OnWindowClose, [&, editor]( const Event* ) {
+		dialog->on( Event::OnWindowClose, [editor]( const Event* ) {
 			if ( editor && !SceneManager::instance()->isShuttingDown() )
 				editor->setFocus();
 		} );
@@ -443,7 +443,7 @@ void App::initPluginManager() {
 			// If plugin loads asynchronously and is not ready, delay the plugin enabled callback
 			plugin->addOnReadyCallback( [this]( UICodeEditorPlugin* plugin, const Uint32& cbId ) {
 				mUISceneNode->runOnMainThread(
-					[&, plugin]() { onPluginEnabled( static_cast<Plugin*>( plugin ) ); } );
+					[this, plugin]() { onPluginEnabled( static_cast<Plugin*>( plugin ) ); } );
 				plugin->removeReadyCallback( cbId );
 			} );
 		}
@@ -920,7 +920,7 @@ UITreeView* App::getProjectTreeView() const {
 }
 
 void App::checkForUpdatesResponse( Http::Response response, bool fromStartup ) {
-	auto updatesError = [&, fromStartup]() {
+	auto updatesError = [this, fromStartup]() {
 		if ( fromStartup )
 			return;
 		UIMessageBox* msg = UIMessageBox::New(
@@ -974,7 +974,7 @@ void App::checkForUpdatesResponse( Http::Response response, bool fromStartup ) {
 							   .unescape() );
 
 				auto url( j.value( "html_url", "https://github.com/SpartanJ/ecode/releases/" ) );
-				msg->on( Event::OnConfirm, [&, url, msg]( const Event* ) {
+				msg->on( Event::OnConfirm, [url, msg]( const Event* ) {
 					Engine::instance()->openURI( url );
 					msg->closeWindow();
 				} );
@@ -1013,9 +1013,10 @@ void App::checkForUpdatesResponse( Http::Response response, bool fromStartup ) {
 
 void App::checkForUpdates( bool fromStartup ) {
 	Http::getAsync(
-		[&, fromStartup]( const Http&, Http::Request&, Http::Response& response ) {
-			mUISceneNode->runOnMainThread(
-				[&, response]() { checkForUpdatesResponse( response, fromStartup ); } );
+		[this, fromStartup]( const Http&, Http::Request&, Http::Response& response ) {
+			mUISceneNode->runOnMainThread( [this, response, fromStartup]() {
+				checkForUpdatesResponse( response, fromStartup );
+			} );
 		},
 		"https://api.github.com/repos/SpartanJ/ecode/releases/latest", Seconds( 30 ) );
 }
@@ -1058,7 +1059,7 @@ void App::setUIScaleFactor() {
 		String::numberClean( String::format( "%.2f", mConfig.windowState.pixelDensity ) ) );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		msgBox->closeWindow();
 		Float val;
 		if ( String::fromString( val, msgBox->getTextInput()->getText() ) && val >= 1 &&
@@ -1093,7 +1094,7 @@ void App::setEditorFontSize() {
 	msgBox->getTextInput()->setText( mConfig.editor.fontSize.toString() );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.editor.fontSize = StyleSheetLength( msgBox->getTextInput()->getText() );
 		mSplitter->forEachEditor( [this]( UICodeEditor* editor ) {
 			editor->setFontSize( mConfig.editor.fontSize.asPixels( 0, Sizef(), mDisplayDPI ) );
@@ -1109,7 +1110,7 @@ void App::setTerminalFontSize() {
 	msgBox->getTextInput()->setText( mConfig.term.fontSize.toString() );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.term.fontSize = StyleSheetLength( msgBox->getTextInput()->getText() );
 		mSplitter->forEachWidget( [this]( UIWidget* widget ) {
 			if ( widget && widget->isType( UI_TYPE_TERMINAL ) )
@@ -1127,7 +1128,7 @@ void App::setUIFontSize() {
 	msgBox->getTextInput()->setText( mConfig.ui.fontSize.toString() );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.ui.fontSize = StyleSheetLength( msgBox->getTextInput()->getText() );
 		Float fontSize = mConfig.ui.fontSize.asPixels( 0, Sizef(), mDisplayDPI );
 		UIThemeManager* manager = mUISceneNode->getUIThemeManager();
@@ -1155,7 +1156,7 @@ void App::setUIPanelFontSize() {
 	msgBox->getTextInput()->setText( mConfig.ui.panelFontSize.toString() );
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.ui.panelFontSize = StyleSheetLength( msgBox->getTextInput()->getText() );
 
 		// Update the CSS
@@ -1245,7 +1246,7 @@ void App::setLineBreakingColumn() {
 	msgBox->getTextInput()->setAllowOnlyNumbers( true, false );
 	msgBox->getTextInput()->setText( String::toString( mConfig.doc.lineBreakingColumn ) );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		int val;
 		if ( String::fromString( val, msgBox->getTextInput()->getText() ) && val >= 0 ) {
 			mConfig.doc.lineBreakingColumn = val;
@@ -1265,7 +1266,7 @@ void App::setLineSpacing() {
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->getTextInput()->setText( mConfig.editor.lineSpacing.toString() );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.editor.lineSpacing = StyleSheetLength( msgBox->getTextInput()->getText() );
 		mSplitter->forEachEditor( [this]( UICodeEditor* editor ) {
 			editor->setLineSpacing( mConfig.editor.lineSpacing );
@@ -1283,7 +1284,7 @@ void App::setCursorBlinkingTime() {
 	msgBox->setCloseShortcut( { KEY_ESCAPE, 0 } );
 	msgBox->getTextInput()->setText( mConfig.editor.cursorBlinkingTime.toString() );
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		mConfig.editor.cursorBlinkingTime =
 			Time::fromString( msgBox->getTextInput()->getText().toUtf8() );
 		mSplitter->forEachEditor( [this]( UICodeEditor* editor ) {
@@ -1959,7 +1960,7 @@ void App::onDocumentLoaded( UICodeEditor* editor, const std::string& path ) {
 
 	// Check if other editor is using the same document and needs to receive the same notification
 	const TextDocument* docPtr = &editor->getDocument();
-	mSplitter->forEachEditor( [&, docPtr, editor]( UICodeEditor* otherEditor ) {
+	mSplitter->forEachEditor( [this, &path, docPtr, editor]( UICodeEditor* otherEditor ) {
 		if ( otherEditor != editor && docPtr == &otherEditor->getDocument() ) {
 			onRealDocumentLoaded( otherEditor, path );
 		}
@@ -2547,13 +2548,13 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) {
 		}
 	} );
 
-	editor->on( Event::OnDocumentDirtyOnFileSysten, [&, editor]( const Event* event ) {
+	editor->on( Event::OnDocumentDirtyOnFileSysten, [this, editor]( const Event* event ) {
 		const DocEvent* docEvent = static_cast<const DocEvent*>( event );
 		FileInfo file( docEvent->getDoc()->getFileInfo().getFilepath() );
 		TextDocument* doc = docEvent->getDoc();
 		if ( doc->getFileInfo() != file ) {
 			if ( doc->isDirty() ) {
-				editor->runOnMainThread( [&, editor]() { createDocDirtyAlert( editor ); } );
+				editor->runOnMainThread( [this, editor]() { createDocDirtyAlert( editor ); } );
 			} else {
 				auto hash = String::hash( "OnDocumentDirtyOnFileSysten-" +
 										  docEvent->getDoc()->getFilePath() );
@@ -2730,7 +2731,7 @@ void App::loadDirTree( const std::string& path ) {
 	mDirTree = std::make_shared<ProjectDirectoryTree>( path, mThreadPool, this );
 	Log::info( "Loading DirTree: %s", path );
 	mDirTree->scan(
-		[&, clock]( ProjectDirectoryTree& dirTree ) {
+		[this, clock]( ProjectDirectoryTree& dirTree ) {
 			Log::info( "DirTree read in: %.2fms. Found %ld files.",
 					   clock->getElapsedTime().asMilliseconds(), dirTree.getFilesCount() );
 			eeDelete( clock );
@@ -2857,7 +2858,7 @@ void App::renameFile( const FileInfo& file ) {
 		newInputMsgBox( i18n( "rename_file", "Rename file" ) + " \"" + file.getFileName() + "\"",
 						i18n( "enter_new_file_name", "Enter new file name:" ) );
 	msgBox->getTextInput()->setText( file.getFileName() );
-	msgBox->on( Event::OnConfirm, [&, file, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, file, msgBox]( const Event* ) {
 		auto newFilePath( getNewFilePath( file, msgBox, false ) );
 		if ( !FileSystem::fileExists( newFilePath ) ||
 			 file.getFileName() != msgBox->getTextInput()->getText() ) {
@@ -2896,7 +2897,7 @@ void App::toggleHiddenFiles() {
 void App::newFile( const FileInfo& file ) {
 	UIMessageBox* msgBox = newInputMsgBox( i18n( "create_new_file", "Create new file" ),
 										   i18n( "enter_new_file_name", "Enter new file name:" ) );
-	msgBox->on( Event::OnConfirm, [&, file, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, file, msgBox]( const Event* ) {
 		auto newFilePath( getNewFilePath( file, msgBox ) );
 		if ( !FileSystem::fileExists( newFilePath ) ) {
 			// Needs to create sub folders?
@@ -2915,7 +2916,7 @@ void App::newFile( const FileInfo& file ) {
 			} else if ( mProjectTreeView ) {
 				// We wait 100 ms to get the notification from the file system
 				mUISceneNode->runOnMainThread(
-					[&, newFilePath] {
+					[this, newFilePath] {
 						if ( !mFileSystemModel || !mProjectTreeView )
 							return;
 						loadFileFromPathOrFocus( newFilePath );
@@ -2934,7 +2935,7 @@ void App::newFolder( const FileInfo& file ) {
 	UIMessageBox* msgBox =
 		newInputMsgBox( i18n( "create_new_folder", "Create new folder" ),
 						i18n( "enter_new_folder_name", "Enter new folder name:" ) );
-	msgBox->on( Event::OnConfirm, [&, file, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, file, msgBox]( const Event* ) {
 		auto newFolderPath( getNewFilePath( file, msgBox ) );
 		if ( !FileSystem::fileExists( newFolderPath ) ) {
 			if ( !FileSystem::makeDir( newFolderPath ) ) {
@@ -2942,7 +2943,7 @@ void App::newFolder( const FileInfo& file ) {
 			} else if ( mProjectTreeView ) {
 				// We wait 100 ms to get the notification from the file system
 				mUISceneNode->runOnMainThread(
-					[&, newFolderPath] {
+					[this, newFolderPath] {
 						if ( !mFileSystemModel || !mProjectTreeView )
 							return;
 						std::string nfp( newFolderPath );
diff --git a/src/tools/ecode/globalsearchcontroller.cpp b/src/tools/ecode/globalsearchcontroller.cpp
index 2a8dbb9d1..662f8fb25 100644
--- a/src/tools/ecode/globalsearchcontroller.cpp
+++ b/src/tools/ecode/globalsearchcontroller.cpp
@@ -117,13 +117,14 @@ void GlobalSearchController::initGlobalSearchBar(
 		mGlobalSearchBarLayout->find<UIDropDownList>( "global_search_history" );
 	mGlobalSearchBarLayout->setCommand( "global-search-clear-history", [this] { clearHistory(); } );
 	mGlobalSearchBarLayout->setCommand(
-		"search-in-files", [&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
+		"search-in-files",
+		[this, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
 			doGlobalSearch( mGlobalSearchInput->getText(), caseSensitiveChk->isChecked(),
 							wholeWordChk->isChecked(), luaPatternChk->isChecked(),
 							escapeSequenceChk->isChecked(), false );
 		} );
 	mGlobalSearchBarLayout->setCommand(
-		"search-again", [&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
+		"search-again", [this, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk] {
 			auto listBox = mGlobalSearchHistoryList->getListBox();
 			if ( listBox->getItemSelectedIndex() < mGlobalSearchHistory.size() ) {
 				doGlobalSearch( mGlobalSearchHistory[mGlobalSearchHistory.size() - 1 -
@@ -154,16 +155,16 @@ void GlobalSearchController::initGlobalSearchBar(
 		mGlobalSearchTree->collapseAll();
 		mGlobalSearchTree->setFocus();
 	} );
-	mGlobalSearchBarLayout->setCommand( "change-case", [&, caseSensitiveChk] {
+	mGlobalSearchBarLayout->setCommand( "change-case", [caseSensitiveChk] {
 		caseSensitiveChk->setChecked( !caseSensitiveChk->isChecked() );
 	} );
-	mGlobalSearchBarLayout->setCommand( "change-whole-word", [&, wholeWordChk] {
+	mGlobalSearchBarLayout->setCommand( "change-whole-word", [wholeWordChk] {
 		wholeWordChk->setChecked( !wholeWordChk->isChecked() );
 	} );
-	mGlobalSearchBarLayout->setCommand( "toggle-lua-pattern", [&, luaPatternChk] {
+	mGlobalSearchBarLayout->setCommand( "toggle-lua-pattern", [luaPatternChk] {
 		luaPatternChk->setChecked( !luaPatternChk->isChecked() );
 	} );
-	mGlobalSearchBarLayout->setCommand( "change-escape-sequence", [&, escapeSequenceChk] {
+	mGlobalSearchBarLayout->setCommand( "change-escape-sequence", [escapeSequenceChk] {
 		escapeSequenceChk->setChecked( !escapeSequenceChk->isChecked() );
 	} );
 	mGlobalSearchBarLayout->setCommand( "find-replace", [this] { mApp->showFindView(); } );
@@ -239,7 +240,7 @@ void GlobalSearchController::initGlobalSearchBar(
 	addClickListener( replaceButton, "replace-in-files" );
 	addClickListener( searchExpandButton, "expand-all" );
 	addClickListener( searchCollapseButton, "collapse-all" );
-	replaceInput->addEventListener( Event::OnPressEnter, [&, replaceInput]( const Event* ) {
+	replaceInput->addEventListener( Event::OnPressEnter, [this, replaceInput]( const Event* ) {
 		if ( replaceInput->hasFocus() )
 			mGlobalSearchBarLayout->execute( "replace-in-files" );
 	} );
@@ -254,7 +255,7 @@ void GlobalSearchController::initGlobalSearchBar(
 	} );
 	mGlobalSearchBarLayout->setCommand(
 		"search-replace-in-files",
-		[&, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk, replaceInput] {
+		[this, caseSensitiveChk, wholeWordChk, luaPatternChk, escapeSequenceChk, replaceInput] {
 			if ( mGlobalSearchTreeReplace == mGlobalSearchTree ) {
 				replaceInput->setFocus();
 				replaceInput->getDocument().selectAll();
@@ -274,7 +275,8 @@ void GlobalSearchController::initGlobalSearchBar(
 								escapeSequenceChk->isChecked(), true );
 			}
 		} );
-	mGlobalSearchBarLayout->setCommand( "replace-in-files", [&, replaceInput, escapeSequenceChk] {
+	mGlobalSearchBarLayout->setCommand( "replace-in-files", [this, replaceInput,
+															 escapeSequenceChk] {
 		auto listBox = mGlobalSearchHistoryList->getListBox();
 		if ( listBox->getItemSelectedIndex() < mGlobalSearchHistory.size() ) {
 			const auto& replaceData = mGlobalSearchHistory[mGlobalSearchHistory.size() - 1 -
@@ -460,7 +462,7 @@ void GlobalSearchController::updateGlobalSearchHistory(
 			mGlobalSearchHistoryList->removeEventListener( mGlobalSearchHistoryOnItemSelectedCb );
 		listBox->setSelected( 0 );
 		mGlobalSearchHistoryOnItemSelectedCb = mGlobalSearchHistoryList->addEventListener(
-			Event::OnItemSelected, [&, searchReplace]( const Event* ) {
+			Event::OnItemSelected, [this, escapeSequence, searchReplace]( const Event* ) {
 				auto idx = mGlobalSearchHistoryList->getListBox()->getItemSelectedIndex();
 				auto idxItem = mGlobalSearchHistory.at( mGlobalSearchHistory.size() - 1 - idx );
 				updateGlobalSearchBarResults( idxItem.first, idxItem.second, searchReplace,
@@ -498,13 +500,13 @@ void GlobalSearchController::doGlobalSearch( String text, bool caseSensitive, bo
 #if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
 			mApp->getThreadPool(),
 #endif
-			[&, clock, search, loader, searchReplace,
-			 searchAgain]( const ProjectSearch::Result& res ) {
+			[this, clock, search, loader, searchReplace, searchAgain,
+			 escapeSequence]( const ProjectSearch::Result& res ) {
 				Log::info( "Global search for \"%s\" took %.2fms", search.c_str(),
 						   clock->getElapsedTime().asMilliseconds() );
 				eeDelete( clock );
-				mUISceneNode->runOnMainThread( [&, loader, res, search, searchReplace, searchAgain,
-												escapeSequence] {
+				mUISceneNode->runOnMainThread( [this, loader, res, search, searchReplace,
+												searchAgain, escapeSequence] {
 					auto model = ProjectSearch::asModel( res );
 					updateGlobalSearchHistory( model, search, searchReplace, searchAgain,
 											   escapeSequence );
@@ -579,7 +581,7 @@ void GlobalSearchController::initGlobalSearchTree( UITreeViewGlobalSearch* searc
 					if ( fileInfo.exists() && fileInfo.isRegularFile() )
 						mApp->loadFileFromPath(
 							path, true, nullptr,
-							[&, lineNum, colNum]( UICodeEditor*, const std::string& ) {
+							[this, lineNum, colNum]( UICodeEditor*, const std::string& ) {
 								onLoadDone( lineNum, colNum );
 							} );
 				} else {
diff --git a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
index 5588fd49a..45a7f7f4e 100644
--- a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
+++ b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
@@ -102,7 +102,7 @@ void AutoCompletePlugin::onRegister( UICodeEditor* editor ) {
 	Lock l( mDocMutex );
 	std::vector<Uint32> listeners;
 	listeners.push_back(
-		editor->addEventListener( Event::OnDocumentLoaded, [&, editor]( const Event* ) {
+		editor->addEventListener( Event::OnDocumentLoaded, [this, editor]( const Event* ) {
 			mDirty = true;
 			mDocs.insert( editor->getDocumentRef().get() );
 			mEditorDocs[editor] = editor->getDocumentRef().get();
@@ -155,7 +155,7 @@ void AutoCompletePlugin::onRegister( UICodeEditor* editor ) {
 			std::string oldLang = event->getOldLang();
 			std::string newLang = event->getNewLang();
 #if defined( AUTO_COMPLETE_THREADED ) && AUTO_COMPLETE_THREADED == 1
-			mThreadPool->run( [&, oldLang, newLang] {
+			mThreadPool->run( [this, oldLang, newLang] {
 				updateLangCache( oldLang );
 				updateLangCache( newLang );
 			} );
@@ -325,7 +325,7 @@ void AutoCompletePlugin::requestSignatureHelp( UICodeEditor* editor ) {
 	auto doc = editor->getDocumentRef();
 	mSignatureHelpPosition = editor->getDocumentRef()->getSelection().start();
 
-	mThreadPool->run( [&, editor]() {
+	mThreadPool->run( [this, editor]() {
 		json data = getURIAndPositionJSON( editor );
 		mManager->sendRequest( this, PluginMessageType::SignatureHelp, PluginMessageFormat::JSON,
 							   &data );
@@ -610,7 +610,7 @@ void AutoCompletePlugin::update( UICodeEditor* ) {
 						continue;
 				}
 #if AUTO_COMPLETE_THREADED
-				mThreadPool->run( [&, doc] { updateDocCache( doc ); } );
+				mThreadPool->run( [this, doc] { updateDocCache( doc ); } );
 #else
 				updateDocCache( doc );
 #endif
diff --git a/src/tools/ecode/plugins/formatter/formatterplugin.cpp b/src/tools/ecode/plugins/formatter/formatterplugin.cpp
index 0144879ed..50eaf06c4 100644
--- a/src/tools/ecode/plugins/formatter/formatterplugin.cpp
+++ b/src/tools/ecode/plugins/formatter/formatterplugin.cpp
@@ -37,7 +37,7 @@ FormatterPlugin::FormatterPlugin( PluginManager* pluginManager, bool sync ) :
 		load( pluginManager );
 	} else {
 #if defined( FORMATTER_THREADED ) && FORMATTER_THREADED == 1
-		mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
+		mThreadPool->run( [this, pluginManager] { load( pluginManager ); } );
 #else
 		load( pluginManager );
 #endif
@@ -387,7 +387,7 @@ void FormatterPlugin::formatDoc( UICodeEditor* editor ) {
 			auto newFile = MD5::fromString( data );
 
 			if ( oldFile != newFile ) {
-				editor->runOnMainThread( [&, data, editor]() {
+				editor->runOnMainThread( [this, data, editor]() {
 					std::shared_ptr<TextDocument> doc = editor->getDocumentRef();
 					auto pos = doc->getSelection();
 					auto scroll = editor->getScroll();
@@ -426,7 +426,7 @@ void FormatterPlugin::runFormatter( UICodeEditor* editor, const Formatter& forma
 		NativeFormatterResult res = mNativeFormatters[formatter.command]( path );
 		if ( !res.success )
 			return;
-		editor->runOnMainThread( [&, res, editor]() {
+		editor->runOnMainThread( [res, editor]() {
 			std::shared_ptr<TextDocument> doc = editor->getDocumentRef();
 			TextPosition pos = doc->getSelection().start();
 			auto scroll = editor->getScroll();
@@ -468,7 +468,7 @@ void FormatterPlugin::runFormatter( UICodeEditor* editor, const Formatter& forma
 			auto newFile = MD5::fromString( data );
 
 			if ( oldFile != newFile ) {
-				editor->runOnMainThread( [&, data, editor]() {
+				editor->runOnMainThread( [data, editor]() {
 					std::shared_ptr<TextDocument> doc = editor->getDocumentRef();
 					TextPosition pos = doc->getSelection().start();
 					auto scroll = editor->getScroll();
diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp
index c5f814360..3a168fdc0 100644
--- a/src/tools/ecode/plugins/git/gitplugin.cpp
+++ b/src/tools/ecode/plugins/git/gitplugin.cpp
@@ -74,7 +74,7 @@ GitPlugin::GitPlugin( PluginManager* pluginManager, bool sync ) :
 		load( pluginManager );
 	} else {
 #if defined( GIT_THREADED ) && GIT_THREADED == 1
-		mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
+		mThreadPool->run( [this, pluginManager] { load( pluginManager ); } );
 #else
 		load( pluginManager );
 #endif
diff --git a/src/tools/ecode/plugins/linter/linterplugin.cpp b/src/tools/ecode/plugins/linter/linterplugin.cpp
index dab2430ad..a1a8cce24 100644
--- a/src/tools/ecode/plugins/linter/linterplugin.cpp
+++ b/src/tools/ecode/plugins/linter/linterplugin.cpp
@@ -37,7 +37,7 @@ LinterPlugin::LinterPlugin( PluginManager* pluginManager, bool sync ) : Plugin(
 		load( pluginManager );
 	} else {
 #if defined( LINTER_THREADED ) && LINTER_THREADED == 1
-		mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
+		mThreadPool->run( [this, pluginManager] { load( pluginManager ); } );
 #else
 		load( pluginManager );
 #endif
@@ -615,7 +615,7 @@ void LinterPlugin::onRegister( UICodeEditor* editor ) {
 		} ) );
 
 	listeners.push_back(
-		editor->addEventListener( Event::OnDocumentChanged, [&, editor]( const Event* ) {
+		editor->addEventListener( Event::OnDocumentChanged, [this, editor]( const Event* ) {
 			TextDocument* oldDoc = mEditorDocs[editor];
 			TextDocument* newDoc = editor->getDocumentRef().get();
 			Lock l( mDocMutex );
@@ -628,7 +628,7 @@ void LinterPlugin::onRegister( UICodeEditor* editor ) {
 		} ) );
 
 	listeners.push_back( editor->addEventListener(
-		Event::OnTextChanged, [&, editor]( const Event* ) { setDocDirty( editor ); } ) );
+		Event::OnTextChanged, [this, editor]( const Event* ) { setDocDirty( editor ); } ) );
 
 	for ( auto& kb : mKeyBindings ) {
 		if ( !kb.second.empty() )
@@ -693,7 +693,7 @@ void LinterPlugin::update( UICodeEditor* editor ) {
 	if ( it != mDirtyDoc.end() && it->second->getElapsedTime() >= mDelayTime ) {
 		mDirtyDoc.erase( doc.get() );
 #if LINTER_THREADED
-		mThreadPool->run( [&, doc] { lintDoc( doc ); } );
+		mThreadPool->run( [this, doc] { lintDoc( doc ); } );
 #else
 		lintDoc( doc );
 #endif
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index 9ae8d57cf..220253dd7 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -127,7 +127,7 @@ LSPClientPlugin::LSPClientPlugin( PluginManager* pluginManager, bool sync ) :
 		load( pluginManager );
 	} else {
 #if defined( LSPCLIENT_THREADED ) && LSPCLIENT_THREADED == 1
-		mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
+		mThreadPool->run( [this, pluginManager] { load( pluginManager ); } );
 #else
 		load( pluginManager );
 #endif
@@ -251,7 +251,7 @@ PluginRequestHandle LSPClientPlugin::processDocumentFormatting( const PluginMess
 
 	auto ret = server.server->documentFormatting(
 		server.uri, msg.asJSON()["options"],
-		[&, server]( const PluginIDType&, const std::vector<LSPTextEdit>& edits ) {
+		[this, server]( const PluginIDType&, const std::vector<LSPTextEdit>& edits ) {
 			mManager->getSplitter()->getUISceneNode()->runOnMainThread(
 				[this, server, edits] { processDocumentFormattingResponse( server.uri, edits ); } );
 		} );
@@ -276,7 +276,7 @@ PluginRequestHandle LSPClientPlugin::processWorkspaceSymbol( const PluginMessage
 	for ( const auto server : servers ) {
 		if ( Engine::instance()->isMainThread() ) {
 			server->workspaceSymbolAsync(
-				query, [&, query]( const PluginIDType& id, LSPSymbolInformationList&& info ) {
+				query, [this, query]( const PluginIDType& id, LSPSymbolInformationList&& info ) {
 					if ( !query.empty() ) {
 						for ( auto& i : info ) {
 							if ( i.score == 0.f )
@@ -288,7 +288,7 @@ PluginRequestHandle LSPClientPlugin::processWorkspaceSymbol( const PluginMessage
 				} );
 		} else {
 			hdl = server->workspaceSymbol(
-				query, [&, query]( const PluginIDType& id, LSPSymbolInformationList&& info ) {
+				query, [this, query]( const PluginIDType& id, LSPSymbolInformationList&& info ) {
 					if ( !query.empty() ) {
 						for ( auto& i : info ) {
 							if ( i.score == 0.f )
@@ -534,7 +534,7 @@ void LSPClientPlugin::createListView( UICodeEditor* editor, const std::shared_pt
 			if ( splitter->editorExists( editor ) )
 				editor->setFocus();
 		} );
-		lv->on( Event::OnModelEvent, [&, onModelEventCb]( const Event* event ) {
+		lv->on( Event::OnModelEvent, [onModelEventCb]( const Event* event ) {
 			const ModelEvent* modelEvent = static_cast<const ModelEvent*>( event );
 			if ( onModelEventCb )
 				onModelEventCb( modelEvent );
@@ -1088,7 +1088,7 @@ size_t LSPClientPlugin::lspFilePatternPosition( const std::vector<LSPDefinition>
 void LSPClientPlugin::getAndGoToLocation( UICodeEditor* editor, const std::string& search ) {
 	mClientManager.getAndGoToLocation(
 		editor->getDocumentRef(), search,
-		[&, editor]( const LSPClientServer::IdType&, const std::vector<LSPLocation>& res ) {
+		[this, editor]( const LSPClientServer::IdType&, const std::vector<LSPLocation>& res ) {
 			if ( res.empty() )
 				return;
 			if ( res.size() == 1 ) {
@@ -1128,7 +1128,7 @@ void LSPClientPlugin::codeAction( UICodeEditor* editor ) {
 
 	mClientManager.codeAction(
 		editor->getDocumentRef(), diagnostics,
-		[&, editor]( const LSPClientServer::IdType&, const std::vector<LSPCodeAction>& res ) {
+		[this, editor]( const LSPClientServer::IdType&, const std::vector<LSPCodeAction>& res ) {
 			createCodeActionsView( editor, res );
 		} );
 }
@@ -1228,12 +1228,12 @@ void LSPClientPlugin::onRegister( UICodeEditor* editor ) {
 	std::vector<Uint32> listeners;
 
 	listeners.push_back(
-		editor->addEventListener( Event::OnDocumentLoaded, [&, editor]( const Event* ) {
+		editor->addEventListener( Event::OnDocumentLoaded, [this, editor]( const Event* ) {
 			mClientManager.run( editor->getDocumentRef() );
 		} ) );
 
 	listeners.push_back(
-		editor->addEventListener( Event::OnCursorPosChange, [&, editor]( const Event* ) {
+		editor->addEventListener( Event::OnCursorPosChange, [this, editor]( const Event* ) {
 			if ( mSymbolInfoShowing )
 				hideTooltip( editor );
 		} ) );
@@ -1260,7 +1260,7 @@ void LSPClientPlugin::getSymbolInfo( UICodeEditor* editor ) {
 		return;
 	server->documentHover(
 		editor->getDocument().getURI(), editor->getDocument().getSelection().start(),
-		[&, editor]( const Int64&, const LSPHover& resp ) {
+		[this, editor]( const Int64&, const LSPHover& resp ) {
 			json j;
 			auto& doc = editor->getDocument();
 			j["uri"] = doc.getURI().toString();
@@ -1505,7 +1505,7 @@ bool LSPClientPlugin::onMouseMove( UICodeEditor* editor, const Vector2i& positio
 	editor->removeActionsByTag( tag );
 	mEditorsTags[editor].insert( tag );
 	editor->runOnMainThread(
-		[&, editor, position, tag]() {
+		[this, editor, position, tag]() {
 			mEditorsTags[editor].erase( tag );
 			if ( !editorExists( editor ) )
 				return;
@@ -1514,7 +1514,7 @@ bool LSPClientPlugin::onMouseMove( UICodeEditor* editor, const Vector2i& positio
 				return;
 			server->documentHover(
 				editor->getDocument().getURI(), currentMouseTextPosition( editor ),
-				[&, editor, position]( const Int64&, const LSPHover& resp ) {
+				[this, editor, position]( const Int64&, const LSPHover& resp ) {
 					if ( editorExists( editor ) && !resp.contents.empty() &&
 						 !resp.contents[0].value.empty() ) {
 						editor->runOnMainThread( [editor, resp, position, this]() {
diff --git a/src/tools/ecode/plugins/lsp/lspclientserver.cpp b/src/tools/ecode/plugins/lsp/lspclientserver.cpp
index 8f94e9f97..61ea3a636 100644
--- a/src/tools/ecode/plugins/lsp/lspclientserver.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientserver.cpp
@@ -1694,7 +1694,7 @@ void LSPClientServer::processRequest( const json& msg ) {
 	if ( method == "workspace/applyEdit" ) {
 		auto workspaceEdit = parseApplyWorkspaceEditParams( msg[MEMBER_PARAMS] );
 		mManager->applyWorkspaceEdit( workspaceEdit.edit,
-									  [&, msgid]( const LSPApplyWorkspaceEditResponse& res ) {
+									  [this, msgid]( const LSPApplyWorkspaceEditResponse& res ) {
 										  getThreadPool()->run( [this, msgid, res] {
 											  write( applyWorkspaceEditResponse( msgid, res ) );
 										  } );
diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
index 7c50d62ce..70cece4de 100644
--- a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
@@ -276,7 +276,7 @@ void LSPClientServerManager::rangeFormatting( std::shared_ptr<TextDocument> doc
 }
 
 void LSPClientServerManager::run( const std::shared_ptr<TextDocument>& doc ) {
-	mThreadPool->run( [&, doc]() { tryRunServer( doc ); } );
+	mThreadPool->run( [this, doc]() { tryRunServer( doc ); } );
 }
 
 size_t LSPClientServerManager::clientCount() const {
diff --git a/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp b/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
index 063a1d17d..d9a451265 100644
--- a/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
+++ b/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
@@ -43,7 +43,7 @@ void LSPDocumentClient::onDocumentTextChanged( const DocumentContentChange& chan
 	// If several change event are being fired, the thread pool can't guaranteed that it will be
 	// executed in FIFO. Se we accumulate the events in a queue and fire them in correct order.
 	mServer->queueDidChange( mDoc->getURI(), mVersion, "", { change } );
-	mServer->getThreadPool()->run( [&, change]() { mServer->processDidChangeQueue(); } );
+	mServer->getThreadPool()->run( [this, change]() { mServer->processDidChangeQueue(); } );
 	requestSymbolsDelayed();
 	requestSemanticHighlightingDelayed();
 }
diff --git a/src/tools/ecode/plugins/plugin.cpp b/src/tools/ecode/plugins/plugin.cpp
index c9dff41ca..a9ed8510a 100644
--- a/src/tools/ecode/plugins/plugin.cpp
+++ b/src/tools/ecode/plugins/plugin.cpp
@@ -143,7 +143,7 @@ void PluginBase::onRegister( UICodeEditor* editor ) {
 		} ) );
 
 	listeners.push_back(
-		editor->addEventListener( Event::OnDocumentChanged, [&, editor]( const Event* ) {
+		editor->addEventListener( Event::OnDocumentChanged, [this, editor]( const Event* ) {
 			TextDocument* oldDoc = mEditorDocs[editor];
 			TextDocument* newDoc = editor->getDocumentRef().get();
 			Lock l( mMutex );
diff --git a/src/tools/ecode/plugins/pluginmanager.cpp b/src/tools/ecode/plugins/pluginmanager.cpp
index 9d4caac56..7dc0b522b 100644
--- a/src/tools/ecode/plugins/pluginmanager.cpp
+++ b/src/tools/ecode/plugins/pluginmanager.cpp
@@ -386,7 +386,7 @@ class UIPluginManagerTable : public UITableView {
 			chk->setChecked(
 				model->data( model->index( index.row(), PluginsModel::Enabled ) ).asBool() );
 			chk->setCheckMode( UICheckBox::Button );
-			chk->on( Event::OnValueChange, [&, index, model, chk]( const Event* ) {
+			chk->on( Event::OnValueChange, [this, index, model, chk]( const Event* ) {
 				bool checked = chk->isChecked();
 				std::string id(
 					model->data( model->index( index.row(), PluginsModel::Id ) ).asCStr() );
@@ -462,18 +462,18 @@ UIWindow* UIPluginManager::New( UISceneNode* sceneNode, PluginManager* manager,
 				loadFileCb( plugin->getFileConfigPath() );
 		}
 	} );
-	tv->setOnSelection( [&, prefs, manager]( const ModelIndex& index ) {
+	tv->setOnSelection( [prefs, manager]( const ModelIndex& index ) {
 		const PluginDefinition* def = manager->getDefinitionIndex( index.row() );
 		if ( def == nullptr )
 			return;
 		prefs->setEnabled( manager->isEnabled( def->id ) &&
 						   manager->get( def->id )->hasFileConfig() );
 	} );
-	tv->onModelEnabledChange = [&, prefs, manager, tv]( const std::string& id, bool enabled ) {
+	tv->onModelEnabledChange = [prefs, manager, tv]( const std::string& id, bool enabled ) {
 		auto* plugin = manager->get( id );
 		if ( enabled && !plugin->isReady() ) {
 			tv->readyCbs[id] = plugin->addOnReadyCallback(
-				[&, manager, prefs, tv]( UICodeEditorPlugin* plugin, const Uint32& cbId ) {
+				[manager, prefs, tv]( UICodeEditorPlugin* plugin, const Uint32& cbId ) {
 					prefs->runOnMainThread( [prefs, manager, plugin]() {
 						prefs->setEnabled( manager->isEnabled( plugin->getId() ) &&
 										   plugin->hasFileConfig() );
@@ -485,7 +485,7 @@ UIWindow* UIPluginManager::New( UISceneNode* sceneNode, PluginManager* manager,
 			prefs->setEnabled( enabled && plugin->hasFileConfig() );
 		}
 	};
-	tv->addEventListener( Event::OnClose, [&, manager, tv]( const Event* ) {
+	tv->addEventListener( Event::OnClose, [manager, tv]( const Event* ) {
 		if ( tv->readyCbs.empty() )
 			return;
 		for ( const auto& cb : tv->readyCbs ) {
diff --git a/src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp b/src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp
index bf5da9131..d04e2d49d 100644
--- a/src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp
+++ b/src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp
@@ -27,7 +27,7 @@ XMLToolsPlugin::XMLToolsPlugin( PluginManager* pluginManager, bool sync ) :
 		load( pluginManager );
 	} else {
 #if defined( XMLTOOLS_THREADED ) && XMLTOOLS_THREADED == 1
-		mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
+		mThreadPool->run( [this, pluginManager] { load( pluginManager ); } );
 #else
 		load( pluginManager );
 #endif
diff --git a/src/tools/ecode/projectdirectorytree.cpp b/src/tools/ecode/projectdirectorytree.cpp
index ca97b043c..3508e9440 100644
--- a/src/tools/ecode/projectdirectorytree.cpp
+++ b/src/tools/ecode/projectdirectorytree.cpp
@@ -38,7 +38,7 @@ void ProjectDirectoryTree::scan( const ProjectDirectoryTree::ScanCompleteEvent&
 								 const bool& ignoreHidden ) {
 #if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
 	mPool->run(
-		[&, acceptedPatterns, ignoreHidden] {
+		[this, acceptedPatterns, ignoreHidden] {
 #endif
 			Lock l( mFilesMutex );
 			mRunning = true;
@@ -161,12 +161,12 @@ std::shared_ptr<FileListModel> ProjectDirectoryTree::matchTree( const std::strin
 
 void ProjectDirectoryTree::asyncFuzzyMatchTree( const std::string& match, const size_t& max,
 												ProjectDirectoryTree::MatchResultCb res ) const {
-	mPool->run( [&, match, max, res]() { res( fuzzyMatchTree( match, max ) ); } );
+	mPool->run( [this, match, max, res]() { res( fuzzyMatchTree( match, max ) ); } );
 }
 
 void ProjectDirectoryTree::asyncMatchTree( const std::string& match, const size_t& max,
 										   ProjectDirectoryTree::MatchResultCb res ) const {
-	mPool->run( [&, match, max, res]() { res( matchTree( match, max ) ); } );
+	mPool->run( [this, match, max, res]() { res( matchTree( match, max ) ); } );
 }
 
 std::shared_ptr<FileListModel>
diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp
index b8539275d..2a62b6637 100644
--- a/src/tools/ecode/settingsmenu.cpp
+++ b/src/tools/ecode/settingsmenu.cpp
@@ -75,7 +75,7 @@ void SettingsMenu::createSettingsMenu( App* app ) {
 	mSettingsMenu->addSeparator();
 	UIMenuSubMenu* fileTypeMenu = mSettingsMenu->addSubMenu(
 		i18n( "file_type", "File Type" ), findIcon( "file-code" ), createFileTypeMenu() );
-	fileTypeMenu->on( Event::OnMenuShow, [&, fileTypeMenu]( const Event* ) {
+	fileTypeMenu->on( Event::OnMenuShow, [this, fileTypeMenu]( const Event* ) {
 		if ( mFileTypeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
 			for ( UIPopUpMenu* menu : mFileTypeMenues )
 				menu->close();
@@ -88,7 +88,7 @@ void SettingsMenu::createSettingsMenu( App* app ) {
 	UIMenuSubMenu* colorSchemeMenu =
 		mSettingsMenu->addSubMenu( i18n( "syntax_color_scheme", "Syntax Color Scheme" ),
 								   findIcon( "palette" ), createColorSchemeMenu() );
-	colorSchemeMenu->on( Event::OnMenuShow, [&, colorSchemeMenu]( const Event* ) {
+	colorSchemeMenu->on( Event::OnMenuShow, [this, colorSchemeMenu]( const Event* ) {
 		if ( mColorSchemeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
 			for ( UIPopUpMenu* menu : mColorSchemeMenues )
 				menu->close();
@@ -150,7 +150,7 @@ UIMenu* SettingsMenu::createFileTypeMenu() {
 	size_t maxItems = 19;
 	auto* dM = SyntaxDefinitionManager::instance();
 	auto names = dM->getLanguageNames();
-	auto cb = [&, dM]( const Event* event ) {
+	auto cb = [this, dM]( const Event* event ) {
 		UIMenuItem* item = event->getNode()->asType<UIMenuItem>();
 		const String& name = item->getText();
 		if ( mSplitter->curEditorExistsAndFocused() ) {
@@ -494,7 +494,7 @@ UIMenu* SettingsMenu::createDocumentMenu() {
 			}
 			mApp->getConfig().editor.autoCloseBrackets = String::join( curPairs, ',' );
 			auto pairs = mApp->makeAutoClosePairs( mApp->getConfig().editor.autoCloseBrackets );
-			mSplitter->forEachEditor( [&, pairs]( UICodeEditor* editor ) {
+			mSplitter->forEachEditor( [pairs]( UICodeEditor* editor ) {
 				editor->getDocument().setAutoCloseBrackets( !pairs.empty() );
 				editor->getDocument().setAutoCloseBracketsPairs( pairs );
 			} );
@@ -693,7 +693,7 @@ UIMenu* SettingsMenu::createDocumentMenu() {
 			msgBox->getTextInput()->setText(
 				String::toString( mApp->getProjectDocConfig().doc.lineBreakingColumn ) );
 			msgBox->showWhenReady();
-			msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+			msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 				int val;
 				if ( String::fromString( val, msgBox->getTextInput()->getText() ) && val >= 0 ) {
 					mApp->getProjectDocConfig().doc.lineBreakingColumn = val;
@@ -742,7 +742,7 @@ UIMenu* SettingsMenu::createTerminalMenu() {
 	UIMenuSubMenu* termColorSchemeMenu = mTerminalMenu->addSubMenu(
 		i18n( "terminal_color_scheme", "Terminal Color Scheme" ), findIcon( "palette" ),
 		mApp->getTerminalManager()->createColorSchemeMenu() );
-	termColorSchemeMenu->on( Event::OnMenuShow, [&, termColorSchemeMenu]( const Event* ) {
+	termColorSchemeMenu->on( Event::OnMenuShow, [this, termColorSchemeMenu]( const Event* ) {
 		mApp->getTerminalManager()->updateMenuColorScheme( termColorSchemeMenu );
 	} );
 #endif
@@ -1049,7 +1049,7 @@ UIMenu* SettingsMenu::createRendererMenu() {
 			msgBox->getTextInput()->setText(
 				String::toString( mApp->getConfig().context.FrameRateLimit ) );
 			msgBox->showWhenReady();
-			msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+			msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 				int val;
 				if ( String::fromString( val, msgBox->getTextInput()->getText() ) && val >= 0 ) {
 					mApp->getConfig().context.FrameRateLimit = val;
@@ -1775,7 +1775,7 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 			->setId( "configure-ignore-files" );
 	}
 
-	mProjectTreeMenu->on( Event::OnItemClicked, [&, file]( const Event* event ) {
+	mProjectTreeMenu->on( Event::OnItemClicked, [this, file]( const Event* event ) {
 		if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) )
 			return;
 		UIMenuItem* item = event->getNode()->asType<UIMenuItem>();
@@ -1795,7 +1795,7 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 								i18n( "duplicate_file", "Duplicate file" ).toUtf8().c_str(),
 								file.getFileName().c_str() ),
 				i18n( "enter_duplicate_file_name", "Enter duplicate file name:" ) );
-			msgBox->on( Event::OnConfirm, [&, file, msgBox]( const Event* ) {
+			msgBox->on( Event::OnConfirm, [this, file, msgBox]( const Event* ) {
 				auto newFilePath( mApp->getNewFilePath( file, msgBox ) );
 				if ( !FileSystem::fileExists( newFilePath ) ) {
 					if ( !FileSystem::fileCopy( file.getFilepath(), newFilePath ) )
@@ -1884,8 +1884,8 @@ void SettingsMenu::deleteFileDialog( const FileInfo& file ) {
 		String::format(
 			i18n( "confirm_remove_file", "Do you really want to remove \"%s\"?" ).toUtf8().c_str(),
 			file.getFileName().c_str() ) );
-	msgBox->on( Event::OnConfirm, [&, file, msgBox]( const Event* ) {
-		auto errFn = [&, file] {
+	msgBox->on( Event::OnConfirm, [this, file, msgBox]( const Event* ) {
+		auto errFn = [this, file] {
 			mApp->errorMsgBox( String::format(
 				std::string( i18n( "couldnt_remove", "Couldn't remove" ).toUtf8() + "%s." ).c_str(),
 				file.isDirectory() ? i18n( "directory", "directory" ).toUtf8().c_str()
diff --git a/src/tools/ecode/statusbuildoutputcontroller.cpp b/src/tools/ecode/statusbuildoutputcontroller.cpp
index f8a45d530..3399b9ec2 100644
--- a/src/tools/ecode/statusbuildoutputcontroller.cpp
+++ b/src/tools/ecode/statusbuildoutputcontroller.cpp
@@ -487,7 +487,7 @@ void StatusBuildOutputController::createContainer() {
 					if ( fileInfo.exists() && fileInfo.isRegularFile() ) {
 						mApp->loadFileFromPath(
 							path, true, nullptr,
-							[&, lineNum, colNum]( UICodeEditor*, const std::string& ) {
+							[this, lineNum, colNum]( UICodeEditor*, const std::string& ) {
 								onLoadDone( lineNum, colNum );
 							} );
 					} else {
@@ -503,7 +503,7 @@ void StatusBuildOutputController::createContainer() {
 								UITab* tab = mSplitter->isDocumentOpen( path );
 								if ( !tab ) {
 									mApp->loadFileFromPath( path, true, nullptr,
-															[&, lineNum, colNum]( auto, auto ) {
+															[this, lineNum, colNum]( auto, auto ) {
 																onLoadDone( lineNum, colNum );
 															} );
 								} else {
diff --git a/src/tools/ecode/terminalmanager.cpp b/src/tools/ecode/terminalmanager.cpp
index 1fbf29a72..7246c200d 100644
--- a/src/tools/ecode/terminalmanager.cpp
+++ b/src/tools/ecode/terminalmanager.cpp
@@ -137,7 +137,7 @@ void TerminalManager::configureTerminalShell() {
 		if ( !shellEnvStr.empty() )
 			shellCombo->getListBox()->setSelected( shellEnvStr );
 	}
-	auto setShellFn = []( App* app, UIWindow* window, UIComboBox* shellCombo ) {
+	const auto setShellFn = []( App* app, UIWindow* window, UIComboBox* shellCombo ) {
 		std::string shell( shellCombo->getText().toUtf8() );
 		if ( !Sys::which( shell ).empty() || FileSystem::fileExists( shell ) ) {
 			app->getConfig().term.shell = shell;
@@ -153,9 +153,9 @@ void TerminalManager::configureTerminalShell() {
 		shellCombo->getListBox()->getVerticalScrollBar()->setClickStep(
 			shellCombo->getDropDownList()->getMaxNumVisibleItems() / (Float)found.size() );
 	ok->setFocus();
-	ok->onClick(
-		[&, window, shellCombo]( const MouseEvent* ) { setShellFn( mApp, window, shellCombo ); },
-		MouseButton::EE_BUTTON_LEFT );
+	ok->onClick( [this, setShellFn, window,
+				  shellCombo]( const MouseEvent* ) { setShellFn( mApp, window, shellCombo ); },
+				 MouseButton::EE_BUTTON_LEFT );
 	cancel->onClick( [window]( const MouseEvent* ) { window->closeWindow(); }, EE_BUTTON_LEFT );
 	window->on( Event::KeyDown, [window]( const Event* event ) {
 		if ( event->asKeyEvent()->getKeyCode() == KEY_ESCAPE )
@@ -175,7 +175,7 @@ void TerminalManager::configureTerminalScrollback() {
 	msgBox->getTextInput()->setText( String::toString( mApp->getConfig().term.scrollback ) );
 	msgBox->center();
 	msgBox->showWhenReady();
-	msgBox->on( Event::OnConfirm, [&, msgBox]( const Event* ) {
+	msgBox->on( Event::OnConfirm, [this, msgBox]( const Event* ) {
 		int val;
 		if ( String::fromString( val, msgBox->getTextInput()->getText() ) && val >= 0 ) {
 			mApp->getConfig().term.scrollback = val;
@@ -307,14 +307,14 @@ UITerminal* TerminalManager::createNewTerminal( const std::string& title, UITabW
 		mApp->setAppTitle( event->getNode()->asType<UITerminal>()->getTitle() );
 	} );
 	setKeybindings( term );
-	term->setCommand( "terminal-rename", [&, term] {
+	term->setCommand( "terminal-rename", [this, term] {
 		UIMessageBox* msgBox = UIMessageBox::New(
 			UIMessageBox::INPUT, mApp->i18n( "new_terminal_name", "New terminal name:" ) );
 		msgBox->setTitle( mApp->getWindowTitle() );
 		msgBox->getTextInput()->setHint( mApp->i18n( "any_name_ellipsis", "Any name..." ) );
 		msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
 		msgBox->showWhenReady();
-		msgBox->addEventListener( Event::OnConfirm, [&, msgBox, term]( const Event* ) {
+		msgBox->addEventListener( Event::OnConfirm, [msgBox, term]( const Event* ) {
 			std::string title( msgBox->getTextInput()->getText().toUtf8() );
 			term->setTitle( title );
 			msgBox->close();
diff --git a/src/tools/ecode/uitreeviewglobalsearch.cpp b/src/tools/ecode/uitreeviewglobalsearch.cpp
index 26ac86caf..cc5776308 100644
--- a/src/tools/ecode/uitreeviewglobalsearch.cpp
+++ b/src/tools/ecode/uitreeviewglobalsearch.cpp
@@ -81,7 +81,7 @@ void UITreeViewCellGlobalSearch::toggleSelected() {
 std::function<UITextView*( UIPushButton* )> UITreeViewCellGlobalSearch::getCheckBoxFn() {
 	return [this]( UIPushButton* ) -> UITextView* {
 		UICheckBox* chk = UICheckBox::New();
-		addEventListener( Event::MouseClick, [&, chk]( const Event* event ) {
+		addEventListener( Event::MouseClick, [this, chk]( const Event* event ) {
 			const MouseEvent* mouseEvent = static_cast<const MouseEvent*>( event );
 			if ( !( mouseEvent->getFlags() & EE_BUTTON_LMASK ) )
 				return 1;
diff --git a/src/tools/ecode/universallocator.cpp b/src/tools/ecode/universallocator.cpp
index 7cdee128e..5f2be778d 100644
--- a/src/tools/ecode/universallocator.cpp
+++ b/src/tools/ecode/universallocator.cpp
@@ -188,7 +188,7 @@ void UniversalLocator::updateCommandPaletteTable() {
 	if ( txt.size() > 1 ) {
 #if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
 		mCommandPalette.asyncFuzzyMatch( txt.substr( 1 ), 1000, [this]( auto res ) {
-			mUISceneNode->runOnMainThread( [&, res] {
+			mUISceneNode->runOnMainThread( [this, res] {
 				mLocateTable->setModel( res );
 				mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) );
 				mLocateTable->scrollToTop();
@@ -790,7 +790,7 @@ void UniversalLocator::requestWorkspaceSymbol() {
 }
 
 void UniversalLocator::updateWorkspaceSymbol( const LSPSymbolInformationList& res ) {
-	mUISceneNode->runOnMainThread( [&, res] {
+	mUISceneNode->runOnMainThread( [this, res] {
 		if ( !mWorkspaceSymbolModel ) {
 			mWorkspaceSymbolModel =
 				LSPSymbolInfoModel::create( mApp->getUISceneNode(), mWorkspaceSymbolQuery, res );
@@ -860,7 +860,7 @@ void UniversalLocator::updateDocumentSymbol( const LSPSymbolInformationList& res
 		} );
 	}
 #else
-	mUISceneNode->runOnMainThread( [&, res] {
+	mUISceneNode->runOnMainThread( [this, res] {
 		if ( mCurDocQuery.empty() ) {
 			mTextDocumentSymbolModel =
 				LSPSymbolInfoModel::create( mApp->getUISceneNode(), mCurDocQuery, res, true );
diff --git a/src/tools/eterm/eterm.cpp b/src/tools/eterm/eterm.cpp
index 1e3b5e926..f36264ec8 100644
--- a/src/tools/eterm/eterm.cpp
+++ b/src/tools/eterm/eterm.cpp
@@ -272,7 +272,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
 				file.getDirectoryPath(), historySize.Get(), nullptr, fb.Get(),
 				!( file.isRegularFile() && file.isExecutable() ) );
 			terminal->getTerminal()->setAllowMemoryTrimnming( true );
-			terminal->pushEventCallback( [&]( const TerminalDisplay::Event& event ) {
+			terminal->pushEventCallback( [&closeOnExit]( const TerminalDisplay::Event& event ) {
 				if ( event.type == TerminalDisplay::EventType::TITLE ) {
 					windowStringData = event.eventData;
 					win->setTitle( "eterm - " + windowStringData );
diff --git a/src/tools/uieditor/uieditor.cpp b/src/tools/uieditor/uieditor.cpp
index ab3670684..108e81dcd 100644
--- a/src/tools/uieditor/uieditor.cpp
+++ b/src/tools/uieditor/uieditor.cpp
@@ -361,7 +361,7 @@ void App::reloadBaseStyleSheet() {
 			if ( !editor )
 				return;
 			saveTmpDocument( editor->getDocument(),
-							 [&, realStyleSheetPath]( const std::string& tmpPath ) {
+							 [this, realStyleSheetPath]( const std::string& tmpPath ) {
 								 mTheme->setStyleSheetPath( tmpPath );
 								 mTheme->reloadStyleSheet();
 								 mTheme->setStyleSheetPath( realStyleSheetPath );
@@ -995,7 +995,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) {
 	if ( FileSystem::fileExtension( editor->getDocument().getFilename() ).empty() )
 		filename += editor->getSyntaxDefinition().getFileExtension();
 	dialog->setFileName( filename );
-	dialog->addEventListener( Event::SaveFile, [&, editor]( const Event* event ) {
+	dialog->addEventListener( Event::SaveFile, [this, editor]( const Event* event ) {
 		if ( editor ) {
 			std::string path( event->getNode()->asType<UIFileDialog>()->getFullPath() );
 			if ( !path.empty() && !FileSystem::isDirectory( path ) &&
@@ -1028,7 +1028,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) {
 		}
 	} );
 	if ( focusOnClose ) {
-		dialog->addEventListener( Event::OnWindowClose, [&, editor]( const Event* ) {
+		dialog->addEventListener( Event::OnWindowClose, [editor]( const Event* ) {
 			if ( editor && !SceneManager::instance()->isShuttingDown() )
 				editor->setFocus();
 		} );
@@ -1504,12 +1504,12 @@ void App::saveAllProcess() {
 				mTmpDocs.erase( &editor->getDocument() );
 			} else {
 				UIFileDialog* dialog = saveFileDialog( editor, false );
-				dialog->addEventListener( Event::SaveFile, [&, editor]( const Event* ) {
+				dialog->addEventListener( Event::SaveFile, [this, editor]( const Event* ) {
 					updateEditorTabTitle( editor );
 					if ( mSplitter->getCurEditor() == editor )
 						updateEditorTitle( editor );
 				} );
-				dialog->addEventListener( Event::OnWindowClose, [&, editor]( const Event* ) {
+				dialog->addEventListener( Event::OnWindowClose, [this, editor]( const Event* ) {
 					mTmpDocs.erase( &editor->getDocument() );
 					if ( !SceneManager::instance()->isShuttingDown() && !mTmpDocs.empty() )
 						saveAllProcess();