diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 115d83eb..80df0eba 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -4,7 +4,7 @@
 <!--  <meta http-equiv="refresh" content="60">-->
 {% end %}
 
-{% block title %}Crafty Controller - Panel Config{% end %}
+{% block title %}Crafty Controller - {{ translate('panelConfig', 'pageTitle', data['lang']) }}{% end %}
 
 {% block content %}
 
@@ -15,7 +15,7 @@
     <div class="col-12">
       <div class="page-header">
           <!-- TODO: Translate the following -->
-        <h4 class="page-title">Panel Config</h4>
+        <h4 class="page-title">{{ translate('panelConfig', 'pageTitle', data['lang']) }}</h4>
       </div>
     </div>
 
@@ -31,11 +31,11 @@
             <div class="col-md-12 col-lg-12 grid-margin stretch-card">
               <div class="card">
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                      <h4 class="card-title"><i class="fas fa-users"></i> Users</h4>
+                      <h4 class="card-title"><i class="fas fa-users"></i> {{ translate('panelConfig', 'users', data['lang']) }}</h4>
                       <span class="too_small" title="{{ translate('dashboard', 'cannotSee', data['lang']) }}", data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}", data-placement="top"></span>
 
                   <!-- TODO: Translate the following -->
-                  <div><a class="nav-link" href="/panel/add_user"><i class="fas fa-plus-circle"></i> &nbsp; Add New User</a></div>
+                  <div><a class="nav-link" href="/panel/add_user"><i class="fas fa-plus-circle"></i> &nbsp; {{ translate('panelConfig', 'newUser', data['lang']) }}</a></div>
                 </div>
                 <div class="card-body">
                   <div class="table-responsive">
@@ -43,11 +43,11 @@
                       <thead>
                         <!-- TODO: Translate the following -->
                         <tr class="rounded">
-                          <th>User</th>
-                          <th>Enabled</th>
-                          <th>Allowed Servers</th>
-                          <th>Assigned Roles</th>
-                          <th>Edit</th>
+                          <th>{{ translate('panelConfig', 'user', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'enabled', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'allowedServers', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'assignedRoles', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'edit', data['lang']) }}</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -94,9 +94,9 @@
             <div class="col-md-12 col-lg-12 grid-margin stretch-card">
               <div class="card">
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                  <h4 class="card-title"><i class="fas fa-user-tag"></i> Roles</h4>
+                  <h4 class="card-title"><i class="fas fa-user-tag"></i> {{ translate('panelConfig', 'roles', data['lang']) }}</h4>
                     <span class="too_small2" title="{{ translate('dashboard', 'cannotSee', data['lang']) }}", data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}", data-placement="top"></span>
-                  <div><a class="nav-link" href="/panel/add_role"><i class="fas fa-plus-circle"></i> &nbsp; Add New Role</a></div>
+                  <div><a class="nav-link" href="/panel/add_role"><i class="fas fa-plus-circle"></i> &nbsp; {{ translate('panelConfig', 'newRole', data['lang']) }}</a></div>
                 </div>
                 <div class="card-body">
                   <div class="table-responsive">
@@ -104,10 +104,10 @@
                       <thead>
                         <!-- TODO: Translate the following -->
                         <tr class="rounded">
-                          <th>Role</th>
-                          <th>Allowed Servers</th>
-                          <th>Role Users</th>
-                          <th>Edit</th>
+                          <th>{{ translate('panelConfig', 'role', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'allowedServers', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'roleUsers', data['lang']) }}</th>
+                          <th>{{ translate('panelConfig', 'edit', data['lang']) }}</th>
                         </tr>
                       </thead>
                       <tbody>
diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index 7b34292d..fa2e1b52 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -4,7 +4,7 @@
 <!--  <meta http-equiv="refresh" content="60">-->
 {% end %}
 
-{% block title %}Crafty Controller - Edit Role{% end %}
+{% block title %}Crafty Controller - {{ translate('rolesConfig', 'pageTitle', data['lang']) }}{% end %}
 
 {% block content %}
 
@@ -16,13 +16,13 @@
       <div class="page-header">
         {% if data['new_role'] %}
           <h4 class="page-title">
-            New Role
+            {{ translate('rolesConfig', 'pageTitleNew', data['lang']) }}
               <br />
               <small>RID: N/A</small>
           </h4>
         {% else %}
           <h4 class="page-title">
-            Edit Role - {{ data['role']['role_name'] }}
+            {{ translate('rolesConfig', 'pageTitle', data['lang']) }} - {{ data['role']['role_name'] }}
               <br />
               <small>RID: {{ data['role']['role_id'] }}</small>
           </h4>
@@ -41,7 +41,7 @@
             <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
               <li class="nav-item">
                 <a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config" role="tab" aria-selected="true">
-                  <i class="fas fa-cogs"></i>Config</a>
+                  <i class="fas fa-cogs"></i>{{ translate('rolesConfig', 'config', data['lang']) }}</a>
               </li>
               <!-- <li class="nav-item">
                 <a class="nav-link" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=other" role="tab" aria-selected="false">
@@ -61,11 +61,11 @@
                       
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user-tag"></i> Role Settings</h4>
+                          <h4 class="card-title"><i class="fas fa-user-tag"></i> {{ translate('rolesConfig', 'roleTitle', data['lang']) }}</h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">
-                            <label for="role_name">Role Name <small class="text-muted ml-1"> - What you wish to call this role</small> </label>
+                            <label for="role_name">{{ translate('rolesConfig', 'roleName', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('rolesConfig', 'roleDesc', data['lang']) }}</small> </label>
                             <input type="text" class="form-control" name="role_name" id="role_name" value="{{ data['role']['role_name']  }}" placeholder="Role Name" >
                           </div>
                         </div>
@@ -73,7 +73,7 @@
                       
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-server"></i> Allowed Servers  <small class="text-muted ml-1"> - servers this role is allowed to access </small> </h4>
+                          <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('rolesConfig', 'roleServers', data['lang']) }}  <small class="text-muted ml-1"> {{ translate('rolesConfig', 'serversDesc', data['lang']) }}</small> </h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">
@@ -81,8 +81,8 @@
                               <table class="table table-hover">
                                 <thead>
                                   <tr class="rounded">
-                                    <th>Server Name</th>
-                                    <th>Access?</th>
+                                    <th>{{ translate('rolesConfig', 'serverName', data['lang']) }}</th>
+                                    <th>{{ translate('rolesConfig', 'serverAccess', data['lang']) }}</th>
                                   </tr>
                                 </thead>
                                 <tbody>
@@ -108,7 +108,7 @@
                       
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user-lock"></i> Roles Permissions <small class="text-muted ml-1"> - permissions this role has on this/these servers </small></h4>
+                          <h4 class="card-title"><i class="fas fa-user-lock"></i> {{ translate('rolesConfig', 'rolePerms', data['lang']) }}<small class="text-muted ml-1"> - {{ translate('rolesConfig', 'permsServer', data['lang']) }} </small></h4>
                         </div>
                         <div class="card-body">                          
                           <div class="form-group">
@@ -116,8 +116,8 @@
                               <table class="table table-hover">
                                 <thead>
                                   <tr class="rounded">
-                                    <th>Permission Name</th>
-                                    <th>Authorized ?</th>
+                                    <th>{{ translate('rolesConfig', 'permName', data['lang']) }}</th>
+                                    <th>{{ translate('rolesConfig', 'permAccess', data['lang']) }}</th>
                                   </tr>
                                 </thead>
                                 <tbody>
@@ -149,14 +149,14 @@
                 <div class="col-md-3 col-sm-12">
                   <div class="card">
                     <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                      <h4  class="card-title"><i class="fas fa-users"></i> Users Assigned to Role:</h4>
+                      <h4  class="card-title"><i class="fas fa-users"></i> {{ translate('rolesConfig', 'roleUsers', data['lang']) }}</h4>
                     </div>
                     <div class="card-body">
                       <div class="table-responsive">
                         <table class="table table-hover">
                           <thead>
                             <tr class="rounded">
-                              <th>User Name</th>
+                              <th>{{ translate('rolesConfig', 'roleUserName', data['lang']) }}</th>
                               <th></th>
                             </tr>
                           </thead>
@@ -183,22 +183,22 @@
                 <div class="col-md-3 col-sm-12">
                   <div class="card">
                     <div class="card-body">
-                      <h4 class="card-title">Role Config Area</h4>
-                      <p class="card-description"> Here is where you can change the configuration of your role</p>
+                      <h4 class="card-title">{{ translate('rolesConfig', 'roleConfigArea', data['lang']) }}</h4>
+                      <p class="card-description"> {{ translate('rolesConfig', 'configDesc', data['lang']) }}</p>
                       <blockquote class="blockquote">
                         <p class="mb-0">
-                            Created: {{ str(data['role']['created']) }}
+                          {{ translate('rolesConfig', 'created', data['lang']) }} {{ str(data['role']['created']) }}
                             <br />
-                            Last updated: {{ str(data['role']['last_update']) }}
+                            {{ translate('rolesConfig', 'configUpdate', data['lang']) }} {{ str(data['role']['last_update']) }}
                             <br />
                         </p>
                       </blockquote>
                       <div class="text-center">
                         {% if data['new_role'] %}
-                          <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete Role</a><br />
-                          <small>You cannot delete something that does not yet exist</small>
+                          <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a><br />
+                          <small>{{ translate('rolesConfig', 'doesNotExist', data['lang']) }}</small>
                         {% else %}
-                          <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i> Delete Role</a>
+                          <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a>
                         {% end %}
                     </div>
                     </div>
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index 457489a3..af472a3e 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -16,13 +16,13 @@
       <div class="page-header">
         {% if data['new_user'] %}
           <h4 class="page-title">
-            New User
+            {{ translate('userConfig', 'pageTitleNew', data['lang']) }}
               <br />
               <small>UID: N/A</small>
           </h4>
         {% else %}
           <h4 class="page-title">
-            Edit User - {{ data['user']['user_id'] }}
+            {{ translate('userConfig', 'pageTitle', data['lang']) }} - {{ data['user']['user_id'] }}
               <br />
               <small>UID: {{ data['user']['user_id'] }}</small>
           </h4>
@@ -41,16 +41,12 @@
             <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
               <li class="nav-item">
                 <a class="nav-link active" href="/panel/{{ 'add_user' if data['new_user'] else 'edit_user' }}?id={{ data['user']['user_id'] }}&subpage=config" role="tab" aria-selected="true">
-                  <i class="fas fa-cogs"></i>Config</a>
+                  <i class="fas fa-cogs"></i> {{ translate('userConfig', 'config', data['lang']) }} - {{ data['user']['user_id'] }}</a>
               </li>
               {% if not data['new_user'] %}
               <li class="nav-item">
                 <a class="nav-link" href="/panel/edit_user_apikeys?id={{ data['user']['user_id'] }}" role="tab" aria-selected="false">
-                  <i class="fas fa-key"></i>API Keys</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" href="/panel/add_user?id={{ data['user']['user_id'] }}&subpage=other" role="tab" aria-selected="false">
-                  <i class="fas fa-folder-tree"></i>Other</a>
+                  <i class="fas fa-key"></i>{{ translate('userConfig', 'apiKey', data['lang']) }} - {{ data['user']['user_id'] }}</a>
               </li>
               {% end %}
             </ul>
@@ -69,27 +65,27 @@
 
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user"></i> User Settings</h4>
+                          <h4 class="card-title"><i class="fas fa-user"></i> {{ translate('userConfig', 'userSettings', data['lang']) }} - {{ data['user']['user_id'] }}</h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">
-                            <label class="form-label" for="username">User Name <small class="text-muted ml-1"> - What you wish to call this user</small> </label>
+                            <label class="form-label" for="username">{{ translate('userConfig', 'userName', data['lang']) }} - {{ data['user']['user_id'] }}<small class="text-muted ml-1"> - {{ translate('userConfig', 'userNameDesc', data['lang']) }} - {{ data['user']['user_id'] }}</small> </label>
                             <input type="text" class="form-control" name="username" id="username" value="{{ data['user']['username']  }}" placeholder="User Name" >
                           </div>
                           <div class="form-group">
-                            <label class="form-label" for="password0">Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
+                            <label class="form-label" for="password0">{{ translate('userConfig', 'password', data['lang']) }} - {{ data['user']['user_id'] }}<small class="text-muted ml-1"> - {{ translate('userConfig', 'leaveBlank', data['lang']) }} - {{ data['user']['user_id'] }}</small> </label>
                             <input type="password" class="form-control" name="password0" id="password0" value="" placeholder="Password" >
                           </div>
                           <div class="form-group">
-                            <label class="form-label" for="password1">Repeat Password <small class="text-muted ml-1"> - leave blank to don't change</small> </label>
+                            <label class="form-label" for="password1">{{ translate('userConfig', 'repeat', data['lang']) }} - {{ data['user']['user_id'] }} <small class="text-muted ml-1"> - {{ translate('userConfig', 'leaveBlank', data['lang']) }} - {{ data['user']['user_id'] }}</small> </label>
                             <input type="password" class="form-control" name="password1" id="password1" value="" placeholder="Repeat Password" >
                           </div>
                           <div class="form-group">
-                            <label class="form-label" for="email">Gravatar Email <small class="text-muted ml-1"> - for the profile picture. this is not required. crafty will never make use of user emails. User emails are strictly for Gravatar</small> </label>
+                            <label class="form-label" for="email">{{ translate('userConfig', 'gravEmail', data['lang']) }} - {{ data['user']['user_id'] }}<small class="text-muted ml-1"> - {{ translate('userConfig', 'gravDesc', data['lang']) }} - {{ data['user']['user_id'] }}</small> </label>
                             <input type="email" class="form-control" name="email" id="email" value="{{ data['user']['email'] }}" placeholder="Gravatar Email" >
                           </div>
                           <div class="form-group">
-                            <label class="form-label" for="language">User Language:</label>
+                            <label class="form-label" for="language">{{ translate('userConfig', 'userLang', data['lang']) }}</label>
                             <select class="form-select form-control form-control-lg select-css" id="language" name="language" form="user_form">
                             {% for lang in data['languages'] %}
                               <option value="{{lang}}">{{lang}}</option>
@@ -101,7 +97,7 @@
 
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user-tag"></i> Roles <small class="text-muted ml-1"> - the roles this user is a member of</small></h4>
+                          <h4 class="card-title"><i class="fas fa-user-tag"></i> {{ translate('userConfig', 'userRoles', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('userConfig', 'userRolesDesc', data['lang']) }}</small></h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">
@@ -109,8 +105,8 @@
                               <table class="table table-hover">
                                 <thead>
                                   <tr class="rounded">
-                                    <th>Role Name</th>
-                                    <th>Member?</th>
+                                    <th>{{ translate('userConfig', 'roleName', data['lang']) }}</th>
+                                    <th>{{ translate('userConfig', 'member', data['lang']) }}</th>
                                   </tr>
                                 </thead>
                                 <tbody>
@@ -138,7 +134,7 @@
 
                       <div class="card">
                         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                          <h4 class="card-title"><i class="fas fa-user-lock"></i> Crafty Permissions <small class="text-muted ml-1"> - permissions this user has on Crafty Controller </small></h4>
+                          <h4 class="card-title"><i class="fas fa-user-lock"></i> {{ translate('userConfig', 'craftyPerms', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('userConfig', 'craftyPermDesc', data['lang']) }}permissions this user has on Crafty Controller </small></h4>
                         </div>
                         <div class="card-body">
                           <div class="form-group">
@@ -146,9 +142,9 @@
                               <table class="table table-hover">
                                 <thead>
                                   <tr class="rounded">
-                                    <th>Permission Name</th>
-                                    <th>Authorized ?</th>
-                                    <th>Number of Uses Allowed (-1=No Limit)</th>
+                                    <th>{{ translate('userConfig', 'permName', data['lang']) }}</th>
+                                    <th>{{ translate('userConfig', 'auth', data['lang']) }}</th>
+                                    <th>{{ translate('userConfig', 'uses', data['lang']) }}</th>
                                   </tr>
                                 </thead>
                                 <tbody>
@@ -175,17 +171,17 @@
                       <div class="form-check-flat">
                         <label for="enabled" class="form-check-label ml-4 mb-4">
                           {% if data['user']['enabled'] %}
-                              <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked="" value="1">Enabled
+                              <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked="" value="1">{{ translate('userConfig', 'enabled', data['lang']) }}
                           {% else %}
-                              <input type="checkbox" class="form-check-input" id="enabled" name="enabled" value="1">Enabled
+                              <input type="checkbox" class="form-check-input" id="enabled" name="enabled" value="1">{{ translate('userConfig', 'enabled', data['lang']) }}
                           {% end %}
                         </label>
 
                         <label for="superuser" class="form-check-label ml-4 mb-4">
                           {% if data['user']['superuser'] %}
-                              <input type="checkbox" onclick="superConfirm()" class="form-check-input" id="superuser" name="superuser" checked="" value="1" {{ data['super-disabled'] }} >Super User
+                              <input type="checkbox" onclick="superConfirm()" class="form-check-input" id="superuser" name="superuser" checked="" value="1" {{ data['super-disabled'] }} >{{ translate('userConfig', 'super', data['lang']) }}
                           {% else %}
-                              <input type="checkbox" onclick="superConfirm()" class="form-check-input" id="superuser" name="superuser" {{ data['super-disabled'] }} value="1" >Super User
+                              <input type="checkbox" onclick="superConfirm()" class="form-check-input" id="superuser" name="superuser" {{ data['super-disabled'] }} value="1" >{{ translate('userConfig', 'super', data['lang']) }}
                           {% end %}
                         </label>
 
@@ -199,19 +195,17 @@
                 <div class="col-md-6 col-sm-12">
                     <div class="card">
                       <div class="card-body">
-                        <h4 class="card-title"><i class="fas fa-user-cog"></i> User Config Area</h4>
-                        <p class="card-description"> Here is where you can change the configuration of your user</p>
+                        <h4 class="card-title"><i class="fas fa-user-cog"></i> {{ translate('userConfig', 'configArea', data['lang']) }}</h4>
+                        <p class="card-description"> {{ translate('userConfig', 'configAreaDesc', data['lang']) }}</p>
                         <blockquote class="blockquote">
                           <p class="mb-0">
-                              Created: {{ str(data['user']['created']) }}
+                            {{ translate('userConfig', 'created', data['lang']) }} {{ str(data['user']['created']) }}
                               <br />
-                              Last login: {{ str(data['user']['last_login']) }}
+                              {{ translate('userConfig', 'lastLogin', data['lang']) }} {{ str(data['user']['last_login']) }}
                               <br />
-                              Last update: {{ str(data['user']['last_update']) }}
+                              {{ translate('userConfig', 'lastUpdate', data['lang']) }} {{ str(data['user']['last_update']) }}
                               <br />
-                              Last IP: {{ data['user']['last_ip'] }}
-                              <br />
-                              API Key: TODO! <!-- TODO -->
+                              {{ translate('userConfig', 'lastIP', data['lang']) }} {{ data['user']['last_ip'] }}
                               <br />
                           </p>
                         </blockquote>
@@ -219,13 +213,13 @@
                     </div>
                     <div class="text-center">
                         {% if data['new_user'] %}
-                            <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete User</a><br />
-                            <small>You cannot delete something that does not yet exist</small>
+                            <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i>{{ translate('userConfig', 'deleteUserB', data['lang']) }}</a><br />
+                            <small>{{ translate('userConfig', 'notExist', data['lang']) }}</small>
                         {% elif data['user']['superuser'] %}
-                            <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> Delete User</a><br />
-                            <small>You cannot delete a superuser</small>
+                            <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i> {{ translate('userConfig', 'deleteUserB', data['lang']) }}</a><br />
+                            <small>{{ translate('userConfig', 'delSuper', data['lang']) }}</small>
                         {% else %}
-                            <button class="btn btn-sm btn-danger delete-user"><i class="fas fa-trash"></i> Delete User</a>
+                            <button class="btn btn-sm btn-danger delete-user"><i class="fas fa-trash"></i> {{ translate('userConfig', 'deleteUserB', data['lang']) }}</a>
                         {% end %}
 
                     </div>
@@ -252,8 +246,8 @@
     console.log("User to delete is {{ data['user']['username']  }}");
 
     bootbox.confirm({
-        title: "{% raw translate('usersConfig', 'deleteUser', data['lang']) %}"+"{{ data['user']['username']  }}",
-        message: "{{ translate('usersConfig', 'confirmDelete', data['lang']) }}",
+        title: "{% raw translate('userConfig', 'deleteUser', data['lang']) %}"+"{{ data['user']['username']  }}",
+        message: "{{ translate('userConfig', 'confirmDelete', data['lang']) }}",
         buttons: {
             cancel: {
                 label: '<i class="fas fa-times"></i> {{ translate("serverBackups", "cancel", data['lang']) }}'
diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index 87706dea..d9fa48c2 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -15,7 +15,7 @@
         <div class="col-12">
             <div class="page-header">
                 <h4 class="page-title">
-                    Edit User API Keys - {{ data['user']['user_id'] }}
+                    {{ translate('apiKeys', 'pageTitle', data['lang']) }} - {{ data['user']['user_id'] }}
                     <br/>
                     <small>UID: {{ data['user']['user_id'] }}</small>
                 </h4>
@@ -35,13 +35,13 @@
                             <a class="nav-link" href="/panel/edit_user?id={{ data['user']['user_id'] }}&subpage=config"
                                role="tab"
                                aria-selected="false">
-                                <i class="fas fa-cogs"></i>Config</a>
+                                <i class="fas fa-cogs"></i>{{ translate('apiKeys', 'config', data['lang']) }}</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link active" href="/panel/edit_user_apikeys?id={{ data['user']['user_id'] }}"
                                role="tab"
                                aria-selected="true">
-                                <i class="fas fa-key"></i>API Keys</a>
+                                <i class="fas fa-key"></i>{{ translate('apiKeys', 'apiKeys', data['lang']) }}</a>
                         </li>
                     </ul>
 
@@ -49,7 +49,7 @@
                         <div class="col-md-7 col-sm-12">
                             <div class="card">
                                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                                    <h4 class="card-title"><i class="fas fa-key"></i> API Keys</h4>
+                                    <h4 class="card-title"><i class="fas fa-key"></i>{{ translate('apiKeys', 'apiKeys', data['lang']) }}</h4>
                                 </div>
                                 <div class="card-body">
                                     <div class="form-group">
@@ -58,11 +58,11 @@
                                                 <thead>
                                                 <tr class="rounded">
                                                     <!--<th>ID</th>-->
-                                                    <th>Name</th>
-                                                    <th>Created</th>
-                                                    <th>Superuser</th>
-                                                    <th>Permissions</th>
-                                                    <th>Buttons</th>
+                                                    <th>{{ translate('apiKeys', 'name', data['lang']) }}</th>
+                                                    <th>{{ translate('apiKeys', 'created', data['lang']) }}</th>
+                                                    <th>{{ translate('apiKeys', 'superUser', data['lang']) }}</th>
+                                                    <th>{{ translate('apiKeys', 'perms', data['lang']) }}</th>
+                                                    <th>{{ translate('apiKeys', 'buttons', data['lang']) }}</th>
                                                 </tr>
                                                 </thead>
                                                 <tbody>
@@ -74,16 +74,16 @@
                                                     <td>
                                                         {% if apikey.superuser %}
                                                         <span class="text-success">
-                                <i class="fas fa-check-square"></i> Yes
+                                <i class="fas fa-check-square"></i> {{ translate('apiKeys', 'yes', data['lang']) }}
                               </span>
                                                         {% else %}
                                                         <span class="text-danger">
-                                <i class="far fa-times-square"></i> No
+                                <i class="far fa-times-square"></i> {{ translate('apiKeys', 'no', data['lang']) }}
                               </span>
                                                         {% end %}
                                                     </td>
-                                                    <td>Server: {{ apikey.server_permissions }}
-                                                        Crafty: {{ apikey.crafty_permissions }}</td>
+                                                    <td>{{ translate('apiKeys', 'server', data['lang']) }} {{ apikey.server_permissions }}
+                                                        {{ translate('apiKeys', 'crafty', data['lang']) }} {{ apikey.crafty_permissions }}</td>
                                                     <td>
                                                         <button
                                                                 class="btn btn-danger delete-api-key"
@@ -94,7 +94,7 @@
                                                                 class="btn btn-outline-primary get-a-token"
                                                                 data-key-id="{{ apikey.token_id }}"
                                                                 data-key-name="{{ apikey.name }}"
-                                                        >Get a token
+                                                        >{{ translate('apiKeys', 'getToken', data['lang']) }}
                                                         </button>
                                                     </td>
                                                 </tr>
@@ -110,7 +110,7 @@
                         <div class="col-md-5 col-sm-12">
                             <div class="card">
                                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                                    <h4 class="card-title"><i class="fas fa-plus"></i> Create new API key</h4>
+                                    <h4 class="card-title"><i class="fas fa-plus"></i> {{ translate('apiKeys', 'createNew', data['lang']) }}</h4>
                                 </div>
                                 <div class="card-body">
                                     <form id="user_form" class="forms-sample" method="post"
@@ -119,9 +119,8 @@
                                         <input type="hidden" name="id" value="{{ data['user']['user_id'] }}">
 
                                         <div class="form-group">
-                                            <label class="form-label" for="username">Name <small
-                                                    class="text-muted ml-1"> - What you wish to
-                                                call this API key</small> </label>
+                                            <label class="form-label" for="username">{{ translate('apiKeys', 'name', data['lang']) }}<small
+                                                    class="text-muted ml-1"> - {{ translate('apiKeys', 'nameDesc', data['lang']) }}</small> </label>
                                             <input type="text" class="form-control" name="name" id="name"
                                                    placeholder="API Key">
                                         </div>
@@ -129,8 +128,8 @@
                                         <table class="table table-hover mb-3">
                                             <thead>
                                             <tr class="rounded">
-                                                <th>Permission Name</th>
-                                                <th>Authorized ?</th>
+                                                <th>{{ translate('apiKeys', 'permName', data['lang']) }}</th>
+                                                <th>{{ translate('apiKeys', 'auth', data['lang']) }}</th>
                                             </tr>
                                             </thead>
                                             <tbody>
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 8ba0fe61..58dd568e 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -76,10 +76,6 @@
         "clickRoot": "Click here to select Root Dir",
         "explainRoot": "Please click the button below to select your server's root dir inside of the archive"
     },
-    "usersConfig":{
-        "deleteUser": "Delete user: ",
-        "confirmDelete": "Are you sure you want to delete this user? This action is irreversible."
-    },
     "dashboard": {
         "dashboard": "Dashboard",
         "memUsage": "Memory Usage",
@@ -304,12 +300,85 @@
         ]
     },
     "panelConfig": {
+        "pageTitle": "Panel Config",
+        "users": "Users",
+        "roles": "Roles",
+        "newUser": "Add New User",
+        "newRole": "Add New Role",
+        "user": "User",
+        "enabled": "Enabled",
+        "allowedServers": "Allowed Servers",
+        "assignedRoles": "Assigned Roles",
+        "edit": "Edit",
+        "role": "Role",
+        "roleUsers": "Role Users",
         "save": "Save",
         "cancel": "Cancel",
         "delete": "Delete",
         "superConfirmTitle": "Enable superuser? Are you sure?",
         "superConfirm": "Proceed only if you want this user to have access to EVERYTHING (all user accounts, servers, panel settings, etc.). They can even revoke your superuser rights."
     },
+    "userConfig": {
+        "pageTitle": "Edit User",
+        "pageTitleNew": "Create User",
+        "config": "Config",
+        "apiKey": "API Keys",
+        "userSettings": "User Settings",
+        "userName": "User Name",
+        "userNameDesc": "What do you want to call this user?",
+        "password": "Password",
+        "repeat": "Repeat Password",
+        "leaveBlank": "To edit user without changing password leave it blank.",
+        "craftyPermDesc": "Crafty permissions this user has ",
+        "gravEmail": "Gravatar™ Email",
+        "gravDesc": "This email is strictly for use with Gravatar™. Crafty will not, under any circumstance make use of this email for anything other than looking up your Gravatar™",
+        "userLang": "User Language",
+        "userRoles": "User Roles",
+        "userRolesDesc": "Roles this user is a member of.",
+        "roleName": "Role Name",
+        "member": "Member?",
+        "craftyPerms": "Crafty Permissons: ",
+        "permName":"Permission Name",
+        "auth": "Authorized? ",
+        "uses": "Number of uses allowed (-1==No Limit)",
+        "super": "Super User",
+        "enabled": "Enabled",
+        "configArea": "User Config Area",
+        "configAreaDesc": "Here is where you change all of your user settings",
+        "created": "Created: ",
+        "lastLogin": "Last Login: ",
+        "lastUpdate": "Last Update: ",
+        "lastIP": "Last IP: ",
+        "deleteUserB": "Delete User",
+        "notExist": "You cannot delete something that doesn't exist!",
+        "delSuper": "You cannot delete a super user",
+        "deleteUser": "Delete user: ",
+        "confirmDelete": "Are you sure you want to delete this user? This action is irreversible."
+    },
+    "rolesConfig": {
+        "pageTitle": "Edit Role",
+        "pageTitleNew": "New Role",
+        "config": "Role Config",
+        "roleTitle": "Roles Settings",
+        "roleName": "Role Name: ",
+        "roleDesc": "What would you like to call this role?",
+        "roleServers": "Allowed Servers",
+        "serversDesc": "servers this role is allowed to access",
+        "serverName": "Server Name",
+        "serverAccess": "Access?",
+        "rolePerms": "Role Permissions",
+        "permsServer": "Permissions this role has for these specified servers",
+        "permName": "Permission Name",
+        "permAccess": "Access?",
+        "roleUsers": "Role Users: ",
+        "roleUserName": "User Name",
+        "roleConfigArea": "Role Config Area",
+        "configDesc": "Here is where you can change the configuration of your role",
+        "created": "Created: ",
+        "configUpdate": "Last Updated: ",
+        "delRole": "Delete Role",
+        "doesNotExist": "You cannot delete something that does not exist yet"
+    },
     "datatables": {
         "i18n": {
             "decimal":        "",
@@ -378,6 +447,23 @@
         "doesNotWorkWithoutJavascript": "<strong>Warning: </strong>Crafty doesn't work properly when JavaScript isn't enabled!"
     },
     "apiKeys": {
+        "pageTitle": "Edit User API Keys",
+        "config": "Config",
+        "apiKeys": "API Keys",
+        "name": "Name",
+        "created": "Created",
+        "perms": "Permissions",
+        "buttons": "Buttons",
+        "yes": "Yes",
+        "no": "No",
+        "server": "Server: ",
+        "crafty": "Crafty: ",
+        "getToken": "Get A Token",
+        "createNew": "Create new API Token",
+        "nameDesc": "What would you like to call this API token? ",
+        "permName": "Permission Name",
+        "auth":"Authorized? ",
+        "superUser": "Super User",
         "deleteKeyConfirmation": "Do you want to delete this API key? This cannot be undone.",
         "deleteKeyConfirmationTitle": "Remove API key ${keyId}?"
     }