diff --git a/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProvider.java b/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProvider.java
deleted file mode 100644
index 7f2ef2901a..0000000000
--- a/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProvider.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright Red Hat, Inc., and individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.aerogear.unifiedpush.keycloak;
-
-import org.keycloak.freemarker.Theme;
-import org.keycloak.freemarker.ThemeProvider;
-import org.keycloak.theme.ClassLoaderTheme;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AerogearThemeProvider implements ThemeProvider {
-
-    public static final String AEROGEAR = "aerogear";
-
-    private static Set<String> ACCOUNT_THEMES = new HashSet<String>();
-    private static Set<String> LOGIN_THEMES = new HashSet<String>();
-    private static Set<String> ADMIN_THEMES = new HashSet<String>();
-    private static Set<String> WELCOME_THEMES = new HashSet<String>();
-
-    static {
-        Collections.addAll(ACCOUNT_THEMES, AEROGEAR);
-        Collections.addAll(LOGIN_THEMES, AEROGEAR);
-        Collections.addAll(ADMIN_THEMES, AEROGEAR);
-        Collections.addAll(WELCOME_THEMES, AEROGEAR);
-    }
-
-    @Override
-    public int getProviderPriority() {
-        return 0;
-    }
-
-    @Override
-    public Theme getTheme(String name, Theme.Type type) throws IOException {
-        if (hasTheme(name, type)) {
-            return new ClassLoaderTheme(name, type, getClass().getClassLoader());
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Set<String> nameSet(Theme.Type type) {
-        switch (type) {
-            case LOGIN:
-                return LOGIN_THEMES;
-            case ACCOUNT:
-                return ACCOUNT_THEMES;
-            case ADMIN:
-                return ADMIN_THEMES;
-            case WELCOME:
-                return WELCOME_THEMES;
-            default:
-                return Collections.emptySet();
-        }
-    }
-
-    @Override
-    public boolean hasTheme(String name, Theme.Type type) {
-        return nameSet(type).contains(name);
-    }
-
-    @Override
-    public void close() {
-    }
-}
diff --git a/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProviderFactory.java b/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProviderFactory.java
deleted file mode 100644
index 13e6f22065..0000000000
--- a/servers/auth-server/src/main/java/org/jboss/aerogear/unifiedpush/keycloak/AerogearThemeProviderFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright Red Hat, Inc., and individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.aerogear.unifiedpush.keycloak;
-
-import org.keycloak.Config;
-import org.keycloak.freemarker.ThemeProvider;
-import org.keycloak.freemarker.ThemeProviderFactory;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.KeycloakSessionFactory;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class AerogearThemeProviderFactory implements ThemeProviderFactory {
-    protected AerogearThemeProvider theme;
-
-    @Override
-    public ThemeProvider create(KeycloakSession providerSession) {
-        return theme;
-    }
-
-    @Override
-    public void init(Config.Scope config) {
-        theme = new AerogearThemeProvider();
-    }
-
-    @Override
-    public void postInit(KeycloakSessionFactory factory) {
-
-    }
-
-    @Override
-    public void close() {
-    }
-
-    @Override
-    public String getId() {
-        return "aerogear";
-    }
-}
diff --git a/servers/auth-server/src/main/resources/META-INF/keycloak-themes.json b/servers/auth-server/src/main/resources/META-INF/keycloak-themes.json
new file mode 100755
index 0000000000..81cca9dc3f
--- /dev/null
+++ b/servers/auth-server/src/main/resources/META-INF/keycloak-themes.json
@@ -0,0 +1,6 @@
+{
+    "themes": [{
+        "name" : "aerogear",
+        "types": [ "admin", "account", "login", "welcome" ]
+    }]
+}
\ No newline at end of file
diff --git a/servers/auth-server/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory b/servers/auth-server/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory
deleted file mode 100755
index 3eb07d5c87..0000000000
--- a/servers/auth-server/src/main/resources/META-INF/services/org.keycloak.freemarker.ThemeProviderFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.jboss.aerogear.unifiedpush.keycloak.AerogearThemeProviderFactory
\ No newline at end of file
diff --git a/servers/auth-server/src/main/resources/theme/account/aerogear/resources/css/account.css b/servers/auth-server/src/main/resources/theme/aerogear/account/resources/css/account.css
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/account/aerogear/resources/css/account.css
rename to servers/auth-server/src/main/resources/theme/aerogear/account/resources/css/account.css
diff --git a/servers/auth-server/src/main/resources/theme/account/aerogear/resources/img/favicon.ico b/servers/auth-server/src/main/resources/theme/aerogear/account/resources/img/favicon.ico
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/account/aerogear/resources/img/favicon.ico
rename to servers/auth-server/src/main/resources/theme/aerogear/account/resources/img/favicon.ico
diff --git a/servers/auth-server/src/main/resources/theme/account/aerogear/resources/img/logo.png b/servers/auth-server/src/main/resources/theme/aerogear/account/resources/img/logo.png
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/account/aerogear/resources/img/logo.png
rename to servers/auth-server/src/main/resources/theme/aerogear/account/resources/img/logo.png
diff --git a/servers/auth-server/src/main/resources/theme/account/base/template.ftl b/servers/auth-server/src/main/resources/theme/aerogear/account/template.ftl
similarity index 61%
rename from servers/auth-server/src/main/resources/theme/account/base/template.ftl
rename to servers/auth-server/src/main/resources/theme/aerogear/account/template.ftl
index ba2ed04881..05a74deac2 100644
--- a/servers/auth-server/src/main/resources/theme/account/base/template.ftl
+++ b/servers/auth-server/src/main/resources/theme/aerogear/account/template.ftl
@@ -28,8 +28,20 @@
             <div class="navbar-collapse navbar-collapse-1">
                 <div class="container">
                     <ul class="nav navbar-nav navbar-utility">
-                        <#if referrer?has_content && referrer.url?has_content><li><a href="${referrer.url}" id="referrer">Back to Console</a></li></#if>
-                        <li><a href="${url.logoutUrl}">Sign Out</a></li>
+                        <#if realm.internationalizationEnabled>
+                            <li>
+                                <div class="kc-dropdown" id="kc-locale-dropdown">
+                                    <a href="#" id="kc-current-locale-link">${locale.current}</a>
+                                    <ul>
+                                        <#list locale.supported as l>
+                                            <li class="kc-dropdown-item"><a href="${l.url}">${l.label}</a></li>
+                                        </#list>
+                                    </ul>
+                                </div>
+                            <li>
+                        </#if>
+                        <#if referrer?has_content && referrer.url?has_content><li><a href="${referrer.url}" id="referrer">${msg("backTo",referrer.name)}</a></li></#if>
+                        <li><a href="${url.logoutUrl}">${msg("doSignOut")}</a></li>
                     </ul>
                 </div>
             </div>
@@ -39,12 +51,13 @@
     <div class="container">
         <div class="bs-sidebar col-sm-3  ng-scope">
             <ul>
-                <li class="<#if active=='account'>active</#if>"><a href="${url.accountUrl}">Account</a></li>
-                <#if features.passwordUpdateSupported><li class="<#if active=='password'>active</#if>"><a href="${url.passwordUrl}">Password</a></li></#if>
-                <li class="<#if active=='totp'>active</#if>"><a href="${url.totpUrl}">Authenticator</a></li>
-                <#if features.social><li class="<#if active=='social'>active</#if>"><a href="${url.socialUrl}">Social</a></li></#if>
-                <li class="<#if active=='sessions'>active</#if>"><a href="${url.sessionsUrl}">Sessions</a></li>
-                <#if features.log><li class="<#if active=='log'>active</#if>"><a href="${url.logUrl}">Log</a></li></#if>
+                <li class="<#if active=='account'>active</#if>"><a href="${url.accountUrl}">${msg("account")}</a></li>
+                <#if features.passwordUpdateSupported><li class="<#if active=='password'>active</#if>"><a href="${url.passwordUrl}">${msg("password")}</a></li></#if>
+                <li class="<#if active=='totp'>active</#if>"><a href="${url.totpUrl}">${msg("authenticator")}</a></li>
+                <#if features.identityFederation><li class="<#if active=='social'>active</#if>"><a href="${url.socialUrl}">${msg("federatedIdentity")}</a></li></#if>
+                <li class="<#if active=='sessions'>active</#if>"><a href="${url.sessionsUrl}">${msg("sessions")}</a></li>
+                <li class="<#if active=='applications'>active</#if>"><a href="${url.applicationsUrl}">${msg("applications")}</a></li>
+                <#if features.log><li class="<#if active=='log'>active</#if>"><a href="${url.logUrl}">${msg("log")}</a></li></#if>
             </ul>
         </div>
 
diff --git a/servers/auth-server/src/main/resources/theme/account/aerogear/theme.properties b/servers/auth-server/src/main/resources/theme/aerogear/account/theme.properties
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/account/aerogear/theme.properties
rename to servers/auth-server/src/main/resources/theme/aerogear/account/theme.properties
diff --git a/servers/auth-server/src/main/resources/theme/admin/aerogear/resources/css/styles.css b/servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/resources/css/styles.css
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/admin/aerogear/resources/css/styles.css
rename to servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/resources/css/styles.css
diff --git a/servers/auth-server/src/main/resources/theme/admin/aerogear/resources/img/logo.png b/servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/resources/img/logo.png
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/admin/aerogear/resources/img/logo.png
rename to servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/resources/img/logo.png
diff --git a/servers/auth-server/src/main/resources/theme/admin/aerogear/theme.properties b/servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/theme.properties
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/admin/aerogear/theme.properties
rename to servers/auth-server/src/main/resources/theme/aerogear/admin/aerogear/theme.properties
diff --git a/servers/auth-server/src/main/resources/theme/login/aerogear/login.ftl b/servers/auth-server/src/main/resources/theme/aerogear/login/login.ftl
similarity index 66%
rename from servers/auth-server/src/main/resources/theme/login/aerogear/login.ftl
rename to servers/auth-server/src/main/resources/theme/aerogear/login/login.ftl
index a6ffdad2c5..bad065b13a 100644
--- a/servers/auth-server/src/main/resources/theme/login/aerogear/login.ftl
+++ b/servers/auth-server/src/main/resources/theme/aerogear/login/login.ftl
@@ -1,25 +1,25 @@
 <#import "template.ftl" as layout>
 <@layout.registrationLayout displayInfo=social.displayInfo; section>
     <#if section = "title">
-        ${rb.loginTitle} UnifiedPush Server
+        ${msg("loginTitle", "UnifiedPush Server")}
     <#elseif section = "header">
-        ${rb.loginTitle} <strong>UnifiedPush Server</strong>
+        ${msg("loginTitle", "UnifiedPush Server")}
     <#elseif section = "form">
         <#if realm.password>
             <form id="kc-form-login" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
                 <div class="${properties.kcFormGroupClass!}">
                     <div class="${properties.kcLabelWrapperClass!}">
-                        <label for="username" class="${properties.kcLabelClass!}">${rb.usernameOrEmail}</label>
+                        <label for="username" class="${properties.kcLabelClass!}"><#if !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
                     </div>
 
                     <div class="${properties.kcInputWrapperClass!}">
-                        <input id="username" class="${properties.kcInputClass!}" name="username" value="${login.username!''}" type="text" autofocus />
+                        <input id="username" class="${properties.kcInputClass!}" name="username" value="${(login.username!'')?html}" type="text" autofocus />
                     </div>
                 </div>
 
                 <div class="${properties.kcFormGroupClass!}">
                     <div class="${properties.kcLabelWrapperClass!}">
-                        <label for="password" class="${properties.kcLabelClass!}">${rb.password}</label>
+                        <label for="password" class="${properties.kcLabelClass!}">${msg("password")}</label>
                     </div>
 
                     <div class="${properties.kcInputWrapperClass!}">
@@ -32,38 +32,34 @@
                         <#if realm.rememberMe>
                             <div class="checkbox">
                                 <label>
-                                    <input id="rememberMe" name="rememberMe" type="checkbox" tabindex="3"> Remember Me
+                                    <#if login.rememberMe??>
+                                        <input id="rememberMe" name="rememberMe" type="checkbox" tabindex="3" checked> ${msg("rememberMe")}
+                                    <#else>
+                                        <input id="rememberMe" name="rememberMe" type="checkbox" tabindex="3"> ${msg("rememberMe")}
+                                    </#if>
                                 </label>
                             </div>
                         </#if>
                         <div class="${properties.kcFormOptionsWrapperClass!}">
                             <#if realm.resetPasswordAllowed>
-                                <span>${rb.loginForgot} <a href="${url.loginPasswordResetUrl}">${rb.password}</a>?</span>
+                                <span><a href="${url.loginPasswordResetUrl}">${msg("doForgotPassword")}</a></span>
                             </#if>
                         </div>
                     </div>
 
                     <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
                         <div class="${properties.kcFormButtonsWrapperClass!}">
-                            <input class="btn btn-primary btn-lg" name="login" id="kc-login" type="submit" value="${rb.logIn}"/>
-                            <input class="btn btn-default btn-lg" name="cancel" id="kc-cancel" type="submit" value="${rb.cancel}"/>
+                            <input class="btn btn-primary btn-lg" name="login" id="kc-login" type="submit" value="${msg("doLogIn")}"/>
+                            <input class="btn btn-default btn-lg" name="cancel" id="kc-cancel" type="submit" value="${msg("doCancel")}"/>
                         </div>
                      </div>
                 </div>
             </form>
-        <#elseif realm.social>
-            <div id="kc-social-providers">
-                <ul>
-                    <#list social.providers as p>
-                        <li><a href="${p.loginUrl}" class="zocial ${p.id}"> <span class="text">${p.name}</span></a></li>
-                    </#list>
-                </ul>
-            </div>
         </#if>
     <#elseif section = "info" >
         <#if realm.password && realm.registrationAllowed>
             <div id="kc-registration">
-                <span>${rb.noAccount} <a href="${url.registrationUrl}">${rb.register}</a></span>
+                <span>${msg("noAccount")} <a href="${url.registrationUrl}">${msg("doRegister")}</a></span>
             </div>
         </#if>
 
@@ -71,7 +67,7 @@
             <div id="kc-social-providers">
                 <ul>
                     <#list social.providers as p>
-                        <li><a href="${p.loginUrl}" class="zocial ${p.id}"> <span class="text">${p.name}</span></a></li>
+                        <li><a href="${p.loginUrl}" id="zocial-${p.alias}" class="zocial ${p.providerId}"> <span class="text">${p.alias}</span></a></li>
                     </#list>
                 </ul>
             </div>
diff --git a/servers/auth-server/src/main/resources/theme/login/aerogear/messages/messages.properties b/servers/auth-server/src/main/resources/theme/aerogear/login/messages/messages.properties
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/login/aerogear/messages/messages.properties
rename to servers/auth-server/src/main/resources/theme/aerogear/login/messages/messages.properties
diff --git a/servers/auth-server/src/main/resources/theme/login/aerogear/resources/css/login.css b/servers/auth-server/src/main/resources/theme/aerogear/login/resources/css/login.css
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/login/aerogear/resources/css/login.css
rename to servers/auth-server/src/main/resources/theme/aerogear/login/resources/css/login.css
diff --git a/servers/auth-server/src/main/resources/theme/login/aerogear/resources/img/favicon.ico b/servers/auth-server/src/main/resources/theme/aerogear/login/resources/img/favicon.ico
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/login/aerogear/resources/img/favicon.ico
rename to servers/auth-server/src/main/resources/theme/aerogear/login/resources/img/favicon.ico
diff --git a/servers/auth-server/src/main/resources/theme/aerogear/login/theme.properties b/servers/auth-server/src/main/resources/theme/aerogear/login/theme.properties
new file mode 100755
index 0000000000..ef68789b74
--- /dev/null
+++ b/servers/auth-server/src/main/resources/theme/aerogear/login/theme.properties
@@ -0,0 +1,4 @@
+parent=keycloak
+import=common/keycloak
+
+styles= ../keycloak/lib/patternfly/css/patternfly.css ../keycloak/css/login.css ../keycloak/lib/zocial/zocial.css ../keycloak/css/login.css css/login.css
\ No newline at end of file
diff --git a/servers/auth-server/src/main/resources/theme/welcome/aerogear/resources/index.html b/servers/auth-server/src/main/resources/theme/aerogear/welcome/resources/index.html
similarity index 100%
rename from servers/auth-server/src/main/resources/theme/welcome/aerogear/resources/index.html
rename to servers/auth-server/src/main/resources/theme/aerogear/welcome/resources/index.html
diff --git a/servers/auth-server/src/main/resources/theme/login/aerogear/theme.properties b/servers/auth-server/src/main/resources/theme/login/aerogear/theme.properties
deleted file mode 100755
index d1b98ed842..0000000000
--- a/servers/auth-server/src/main/resources/theme/login/aerogear/theme.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-parent=keycloak
-import=common/keycloak
-
-styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/login.css ../patternfly/lib/zocial/zocial.css ../keycloak/css/login.css css/login.css
\ No newline at end of file