diff --git a/Configuration/TypoScript/Library/lib.menu.language.standard.setupts b/Configuration/TypoScript/Library/lib.menu.language.standard.setupts
index e2edb163..486af4b9 100644
--- a/Configuration/TypoScript/Library/lib.menu.language.standard.setupts
+++ b/Configuration/TypoScript/Library/lib.menu.language.standard.setupts
@@ -10,17 +10,10 @@ lib.menu.language.standard {
         defaultLanguageLabel.value = {$themes.languages.default.label}
     }
     dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 = TYPO3\CMS\Frontend\DataProcessing\LanguageMenuProcessor
         10 {
-            special = language
-            special.value = 0
-            special.value {
-                override = 0,{$themes.languages.available}
-                override.if {
-                    isTrue = {$themes.languages.available}
-                }
-            }
-            as = languages
+           languages = auto
+           as = languages
         }
         20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
         20 {
diff --git a/Resources/Private/Templates/FluidStyledContent/LanguageMenuStandard.html b/Resources/Private/Templates/FluidStyledContent/LanguageMenuStandard.html
index 0633856e..91f6f410 100644
--- a/Resources/Private/Templates/FluidStyledContent/LanguageMenuStandard.html
+++ b/Resources/Private/Templates/FluidStyledContent/LanguageMenuStandard.html
@@ -3,9 +3,8 @@
 <f:if condition="{languages}">
 	<div class="header-top__language-menu">
 		<f:for each="{languages}" as="language">
+			<f:variable name="languageFlag"><f:spaceless><f:render section="getLanguageFlag" arguments="{_all}" /></f:spaceless></f:variable>
 			<f:if condition="{language.active}">
-				<f:variable name="languageFlag"><f:spaceless><f:render section="getLanguageFlag" arguments="{_all}" /></f:spaceless></f:variable>
-				<f:variable name="languageLabel"><f:spaceless><f:render section="getLanguageLabel" arguments="{_all}" /></f:spaceless></f:variable>
 				<a class="header-top__language-menu-btn js__header-top__language-menu-btn" href="/#"><span class="main-flag-icon flag-icon flag-icon-{languageFlag}"></span><f:if condition="{theme:constant(constant:'themes.configuration.elem.status.showHeaderTopLangLabel')}">
 					<span class="main-flag-language flag-language">{f:translate(key:'languageMenu_label', extensionName:'theme_t3kit')}</span>
 				</f:if></a>
@@ -13,14 +12,13 @@
 		</f:for>
 		<div class="header-top__language-menu-box js__header-top__language-menu-box">
 			<f:for each="{languages}" as="language">
-				<f:variable name="languageFlag"><f:spaceless><f:render section="getLanguageFlag" arguments="{_all}" /></f:spaceless></f:variable>
-				<f:variable name="languageLabel"><f:spaceless><f:render section="getLanguageLabel" arguments="{_all}" /></f:spaceless></f:variable>
+			<f:variable name="languageFlag"><f:spaceless><f:render section="getLanguageFlag" arguments="{_all}" /></f:spaceless></f:variable>
 				<f:link.page addQueryString="1"
-							 additionalParams="{L: language.languageUid}"
-							 title="{language.label}"
+							 additionalParams="{L: language.languageId}"
+							 title="{language.title}"
 							 class="header-top__language-menu-box-item{f:if(condition: language.active, then: ' active')}"
 							 argumentsToBeExcludedFromQueryString="{0: 'id'}"><f:spaceless>
-						<span class="flag-icon flag-icon-{languageFlag}"></span> {languageLabel}
+						<span class="flag-icon flag-icon-{languageFlag}"></span> {language.navigationTitle}
 				</f:spaceless></f:link.page>
 			</f:for>
 			<a class="header-top__language-menu-box-close-btn js__header-top__language-menu-box-close-btn"></a>
@@ -28,38 +26,20 @@
 	</div>
 </f:if>
 
-<f:comment><!-- need to have current language in language variable --></f:comment>
-<f:section name="getLanguageLabel">
-	<f:variable name="getLanguageLabel">?</f:variable>
-	<f:if condition="{language.languageUid} == 0">
-		<f:then>
-			<f:variable name="getLanguageLabel">{defaultLanguageLabel}</f:variable>
-		</f:then>
-		<f:else>
-			<f:for each="{sysLanguages}" as="sysLanguage">
-				<f:if condition="{sysLanguage.data.uid} == {language.languageUid}">
-					<f:variable name="getLanguageLabel">{sysLanguage.data.title}</f:variable>
-				</f:if>
-			</f:for>
-		</f:else>
-	</f:if>
-	{getLanguageLabel}
-</f:section>
-
 <f:comment><!-- need to have current language in language variable --></f:comment>
 <f:section name="getLanguageFlag">
 	<f:variable name="getLanguageFlag">unknown</f:variable>
-	<f:if condition="{language.languageUid} == 0">
+	<f:if condition="{language.languageId} == 0">
 		<f:then>
 			<f:variable name="getLanguageFlag">{defaultLanguageFlag}</f:variable>
 		</f:then>
 		<f:else>
 			<f:for each="{sysLanguages}" as="sysLanguage">
-				<f:if condition="{sysLanguage.data.uid} == {language.languageUid}">
+				<f:if condition="{sysLanguage.data.uid} == {language.languageId}">
 					<f:variable name="getLanguageFlag">{sysLanguage.data.flag}</f:variable>
 				</f:if>
 			</f:for>
 		</f:else>
 	</f:if>
 	{getLanguageFlag}
-</f:section>
+</f:section>
\ No newline at end of file