diff --git a/src/eepp/ui/doc/languages/smallbasic.cpp b/src/eepp/ui/doc/languages/smallbasic.cpp
index 76c3301e3..8d2ca00d8 100644
--- a/src/eepp/ui/doc/languages/smallbasic.cpp
+++ b/src/eepp/ui/doc/languages/smallbasic.cpp
@@ -109,14 +109,17 @@ void addSmallBASIC() {
 			  { "elif", "keyword" },
 			  { "else", "keyword" },
 			  { "elseif", "keyword" },
+			  { "ELIF", "keyword" },
+			  { "ELSE", "keyword" },
+			  { "ELSEIF", "keyword" },
 			  { "empty", "keyword" },
 			  { "enclose", "keyword" },
 			  { "end", "keyword" },
-			  { "end", "keyword" },
+			  { "END", "keyword" },
 			  { "try", "keyword" },
 			  { "endif", "keyword" },
 			  { "env", "keyword" },
-			  { "env", "keyword" },
+			  { "ENV", "keyword" },
 			  { "eof", "keyword" },
 			  { "eqv", "keyword" },
 			  { "erase", "keyword" },
@@ -132,6 +135,7 @@ void addSmallBASIC() {
 			  { "fix", "keyword" },
 			  { "floor", "keyword" },
 			  { "for", "keyword" },
+			  { "FOR", "keyword" },
 			  { "form", "keyword" },
 			  { "format", "keyword" },
 			  { "frac", "keyword" },
@@ -143,6 +147,7 @@ void addSmallBASIC() {
 			  { "hex", "keyword" },
 			  { "home", "keyword" },
 			  { "if", "keyword" },
+			  { "IF", "keyword" },
 			  { "iff", "keyword" },
 			  { "image", "keyword" },
 			  { "imp", "keyword" },
@@ -151,8 +156,8 @@ void addSmallBASIC() {
 			  { "include", "keyword" },
 			  { "inkey", "keyword" },
 			  { "input", "keyword" },
-			  { "input", "keyword" },
-			  { "input", "keyword" },
+			  { "Input", "keyword" },
+			  { "END", "keyword" },
 			  { "insert", "keyword" },
 			  { "instr", "keyword" },
 			  { "int", "keyword" },
@@ -205,6 +210,7 @@ void addSmallBASIC() {
 			  { "mod", "keyword" },
 			  { "nand", "keyword" },
 			  { "next", "keyword" },
+			  { "NEXT", "keyword" },
 			  { "nil", "keyword" },
 			  { "nor", "keyword" },
 			  { "nosound", "keyword" },
@@ -237,6 +243,7 @@ void addSmallBASIC() {
 			  { "read", "keyword" },
 			  { "rect", "keyword" },
 			  { "redim", "keyword" },
+			  { "REDIM", "keyword" },
 			  { "rem", "keyword" },
 			  { "rename", "keyword" },
 			  { "repeat", "keyword" },
@@ -291,6 +298,7 @@ void addSmallBASIC() {
 			  { "str", "keyword" },
 			  { "string", "keyword" },
 			  { "sub", "keyword" },
+			  { "SUB", "keyword" },
 			  { "sum", "keyword" },
 			  { "sumsq", "keyword" },
 			  { "swap", "keyword" },
@@ -300,6 +308,7 @@ void addSmallBASIC() {
 			  { "textheight", "keyword" },
 			  { "textwidth", "keyword" },
 			  { "then", "keyword" },
+			  { "THEN", "keyword" },
 			  { "throw", "keyword" },
 			  { "ticks", "keyword" },
 			  { "time", "keyword" },
@@ -308,6 +317,7 @@ void addSmallBASIC() {
 			  { "timestamp", "keyword" },
 			  { "tload", "keyword" },
 			  { "to", "keyword" },
+			  { "TO", "keyword" },
 			  { "translate", "keyword" },
 			  { "trim", "keyword" },
 			  { "troff", "keyword" },
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 9e6b87857..a4deb6bbd 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -2318,7 +2318,7 @@ void App::createDocManyLangsAlert( UICodeEditor* editor ) {
 		btn->setText( lang->getLanguageName() );
 		btn->setLayoutMarginRight( PixelDensity::dpToPx( 8 ) );
 		btn->onClick( [this, editor, lang, docAlert, ext]( auto ) {
-			editor->getDocument().setSyntaxDefinition( *lang );
+			editor->setSyntaxDefinition( *lang );
 			editor->disableReportSizeChangeToChilds();
 			docAlert->close();
 			editor->setFocus();
@@ -2634,7 +2634,7 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) {
 			if ( hasConfig != mConfig.languagesExtensions.priorities.end() &&
 				 ( def = SyntaxDefinitionManager::instance()->getPtrByLSPName(
 					   hasConfig->second ) ) ) {
-				editor->getDocument().setSyntaxDefinition( *def );
+				editor->setSyntaxDefinition( *def );
 			} else {
 				createDocManyLangsAlert( editor );
 			}