diff --git a/themes/src/main/resources/theme/keycloak.v2/login/login-recovery-authn-code-config.ftl b/themes/src/main/resources/theme/keycloak.v2/login/login-recovery-authn-code-config.ftl
new file mode 100644
index 0000000000..ea1e459dc2
--- /dev/null
+++ b/themes/src/main/resources/theme/keycloak.v2/login/login-recovery-authn-code-config.ftl
@@ -0,0 +1,192 @@
+<#import "template.ftl" as layout>
+<#import "password-commons.ftl" as passwordCommons>
+<@layout.registrationLayout; section>
+
+<#if section = "header">
+        ${msg("recovery-code-config-header")}
+<#elseif section = "form">
+        <!-- warning -->
+<div class="pf-v5-c-alert pf-m-warning pf-m-inline pf-v5-u-mb-md ${properties.kcRecoveryCodesWarning!}" aria-label="Warning alert">
+<div class="pf-v5-c-alert__icon">
+    <i class="fas fa-fw fa-bell" aria-hidden="true"></i>
+</div>
+<h4 class="pf-v5-c-alert__title">
+    <span class="pf-screen-reader">Warning alert:</span>
+    ${msg("recovery-code-config-warning-title")}
+</h4>
+<div class="pf-v5-c-alert__description">
+    <p>${msg("recovery-code-config-warning-message")}</p>
+</div>
+</div>
+
+<div class="pf-v5-c-panel pf-m-raised">
+<div class="pf-v5-c-panel__main">
+    <div class="pf-v5-c-panel__main-body">
+        <ol id="kc-recovery-codes-list" class="pf-v5-c-list ${properties.kcRecoveryCodesList!}" role="list">
+            <#list recoveryAuthnCodesConfigBean.generatedRecoveryAuthnCodesList as code>
+            <li>${code[0..3]}-${code[4..7]}-${code[8..]}</li>
+        </#list>
+    </ol>
+</div>
+</div>
+        </div>
+
+        <!-- actions -->
+<div class="${properties.kcRecoveryCodesActions!}">
+<button id="printRecoveryCodes" class="pf-v5-c-button pf-m-link" type="button">
+    <i class="fas fa-print"></i> ${msg("recovery-codes-print")}
+</button>
+<button id="downloadRecoveryCodes" class="pf-v5-c-button pf-m-link" type="button">
+    <i class="fas fa-download"></i> ${msg("recovery-codes-download")}
+</button>
+<button id="copyRecoveryCodes" class="pf-v5-c-button pf-m-link" type="button">
+    <i class="fas fa-copy"></i> ${msg("recovery-codes-copy")}
+</button>
+</div>
+
+        <!-- confirmation checkbox -->
+<div class="${properties.kcFormOptionsClass!} pf-v5-u-mt-md">
+<input class="${properties.kcCheckInputClass!}" type="checkbox" id="kcRecoveryCodesConfirmationCheck" name="kcRecoveryCodesConfirmationCheck"
+       onchange="document.getElementById('saveRecoveryAuthnCodesBtn').disabled = !this.checked;"
+/>
+<label for="kcRecoveryCodesConfirmationCheck">${msg("recovery-codes-confirmation-message")}</label>
+</div>
+
+<form action="${url.loginAction}" class="${properties.kcFormGroupClass!}" id="kc-recovery-codes-settings-form" method="post">
+<input type="hidden" name="generatedRecoveryAuthnCodes" value="${recoveryAuthnCodesConfigBean.generatedRecoveryAuthnCodesAsString}" />
+<input type="hidden" name="generatedAt" value="${recoveryAuthnCodesConfigBean.generatedAt?c}" />
+<input type="hidden" id="userLabel" name="userLabel" value="${msg("recovery-codes-label-default")}" />
+<@passwordCommons.logoutOtherSessions/>
+
+<#if isAppInitiatedAction??>
+<input type="submit"
+       class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}"
+       id="saveRecoveryAuthnCodesBtn" value="${msg("recovery-codes-action-complete")}"
+disabled
+/>
+<button type="submit"
+        class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!} ${properties.kcButtonLargeClass!}"
+        id="cancelRecoveryAuthnCodesBtn" name="cancel-aia" value="true" />${msg("recovery-codes-action-cancel")}
+</button>
+<#else>
+<input type="submit"
+       class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
+       id="saveRecoveryAuthnCodesBtn" value="${msg("recovery-codes-action-complete")}"
+        disabled
+        />
+        </#if>
+        </form>
+
+<script>
+/* copy recovery codes  */
+function copyRecoveryCodes() {
+    var tmpTextarea = document.createElement("textarea");
+    var codes = document.getElementById("kc-recovery-codes-list").getElementsByTagName("li");
+    for (i = 0; i < codes.length; i++) {
+        tmpTextarea.value = tmpTextarea.value + codes[i].innerText + "\n";
+    }
+    document.body.appendChild(tmpTextarea);
+    tmpTextarea.select();
+    document.execCommand("copy");
+    document.body.removeChild(tmpTextarea);
+}
+
+var copyButton = document.getElementById("copyRecoveryCodes");
+copyButton && copyButton.addEventListener("click", function () {
+    copyRecoveryCodes();
+});
+
+/* download recovery codes  */
+function formatCurrentDateTime() {
+    var dt = new Date();
+    var options = {
+        month: 'long',
+        day: 'numeric',
+        year: 'numeric',
+        hour: 'numeric',
+        minute: 'numeric',
+        timeZoneName: 'short'
+    };
+
+    return dt.toLocaleString('en-US', options);
+}
+
+function parseRecoveryCodeList() {
+    var recoveryCodes = document.querySelectorAll(".kc-recovery-codes-list li");
+    var recoveryCodeList = "";
+
+    for (var i = 0; i < recoveryCodes.length; i++) {
+        var recoveryCodeLiElement = recoveryCodes[i].innerText;
+        recoveryCodeList += recoveryCodeLiElement + "\r\n";
+    }
+
+    return recoveryCodeList;
+}
+
+function buildDownloadContent() {
+    var recoveryCodeList = parseRecoveryCodeList();
+    var dt = new Date();
+    var options = {
+        month: 'long',
+        day: 'numeric',
+        year: 'numeric',
+        hour: 'numeric',
+        minute: 'numeric',
+        timeZoneName: 'short'
+    };
+
+    return fileBodyContent =
+        "${msg("recovery-codes-download-file-header")}\n\n" +
+        recoveryCodeList + "\n" +
+        "${msg("recovery-codes-download-file-description")}\n\n" +
+        "${msg("recovery-codes-download-file-date")} " + formatCurrentDateTime();
+}
+
+function setUpDownloadLinkAndDownload(filename, text) {
+    var el = document.createElement('a');
+    el.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
+    el.setAttribute('download', filename);
+    el.style.display = 'none';
+    document.body.appendChild(el);
+    el.click();
+    document.body.removeChild(el);
+}
+
+function downloadRecoveryCodes() {
+    setUpDownloadLinkAndDownload('kc-download-recovery-codes.txt', buildDownloadContent());
+}
+
+var downloadButton = document.getElementById("downloadRecoveryCodes");
+downloadButton && downloadButton.addEventListener("click", downloadRecoveryCodes);
+
+/* print recovery codes */
+function buildPrintContent() {
+    var recoveryCodeListHTML = document.getElementById('kc-recovery-codes-list').innerHTML;
+    var styles =
+        `@page { size: auto;  margin-top: 0; }
+        body { width: 480px; }
+        div { list-style-type: none; font-family: monospace }
+        p:first-of-type { margin-top: 48px }`;
+
+    return printFileContent =
+        "<html><style>" + styles + "</style><body>" +
+        "<title>kc-download-recovery-codes</title>" +
+        "<p>${msg("recovery-codes-download-file-header")}</p>" +
+        "<div>" + recoveryCodeListHTML + "</div>" +
+        "<p>${msg("recovery-codes-download-file-description")}</p>" +
+        "<p>${msg("recovery-codes-download-file-date")} " + formatCurrentDateTime() + "</p>" +
+        "</body></html>";
+}
+
+function printRecoveryCodes() {
+    var w = window.open();
+    w.document.write(buildPrintContent());
+    w.print();
+    w.close();
+}
+
+var printButton = document.getElementById("printRecoveryCodes");
+printButton && printButton.addEventListener("click", printRecoveryCodes);
+</script>
+        </#if>
+        </@layout.registrationLayout>
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css b/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
index 9e816fcf7d..2481ddbf26 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
+++ b/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
@@ -69,3 +69,10 @@ div.kc-logo-text span {
     border-color: transparent black transparent transparent;
 }
 
+.kc-recovery-codes-list {
+    columns: 2;
+}
+
+#certificate_subjectDN {
+    overflow-wrap: break-word
+}
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/select-authenticator.ftl b/themes/src/main/resources/theme/keycloak.v2/login/select-authenticator.ftl
new file mode 100644
index 0000000000..f14db8e929
--- /dev/null
+++ b/themes/src/main/resources/theme/keycloak.v2/login/select-authenticator.ftl
@@ -0,0 +1,36 @@
+<#import "template.ftl" as layout>
+<@layout.registrationLayout displayInfo=false; section>
+    <#if section = "header" || section = "show-username">
+        <#if section = "header">
+            ${msg("loginChooseAuthenticator")}
+        </#if>
+    <#elseif section = "form">
+
+        <form id="kc-select-credential-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+            <ul class="pf-v5-c-data-list" role="list">
+                <#list auth.authenticationSelections as authenticationSelection>
+                <li class="pf-v5-c-data-list__item pf-m-clickable">
+                    <div class="pf-v5-c-data-list__item-row" onclick="document.forms[0].submit()">
+                        <div class="pf-v5-c-data-list__item-content">
+                            <div class="pf-v5-c-data-list__cell pf-m-icon">
+                                <i class="${properties['${authenticationSelection.iconCssClass}']!authenticationSelection.iconCssClass} ${properties.kcSelectAuthListItemIconPropertyClass!}"></i>
+                            </div>
+                            <div class="pf-v5-c-data-list__cell pf-m-no-fill">
+                                <h2 class="pf-v5-u-font-family-heading">${msg('${authenticationSelection.displayName}')}</h2>
+                            </div>
+                            <div class="pf-v5-c-data-list__cell pf-m-no-fill">
+                                ${msg('${authenticationSelection.helpText}')}
+                            </div>
+                        </div>
+                        <div class="pf-v5-c-data-list__item-action">
+                            <i class="${properties.kcSelectAuthListItemArrowIconClass!}" aria-hidden="true"></i>
+                        </div>
+                    </div>
+                </li>
+            </#list>
+            </ul>
+        </form>
+
+    </#if>
+</@layout.registrationLayout>
+