diff --git a/app/config/actions.xml b/app/config/actions.xml
index 26205c98..1ba6d586 100644
--- a/app/config/actions.xml
+++ b/app/config/actions.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE actions>
 <actions>
     <action multiple="1">
-        <id>1</id>
+        <id>2</id>
         <name>ACCOUNT_SEARCH</name>
         <text>Buscar Cuentas</text>
         <route>account/search</route>
     </action>
     <action multiple="1">
-        <id>10</id>
+        <id>1</id>
         <name>ACCOUNT</name>
         <text>Cuentas</text>
         <route>account/index</route>
     </action>
     <action multiple="1">
-        <id>11</id>
+        <id>20</id>
         <name>ACCOUNT_FILE</name>
         <text>Archivos</text>
         <route>account/listFile</route>
@@ -26,805 +26,805 @@
         <route>account/requestAccess</route>
     </action>
     <action multiple="1">
-        <id>13</id>
+        <id>30</id>
         <name>ACCOUNT_FAVORITE</name>
         <text>Favoritos</text>
         <route>favorite/index</route>
     </action>
     <action multiple="1">
-        <id>20</id>
+        <id>1201</id>
         <name>WIKI</name>
         <text>Wiki</text>
         <route>wiki/index</route>
     </action>
     <action multiple="1">
-        <id>60</id>
+        <id>5001</id>
         <name>ITEMS_MANAGE</name>
         <text>Elementos y Personalización</text>
         <route>itemManager/index</route>
     </action>
     <action multiple="1">
-        <id>61</id>
+        <id>101</id>
         <name>CATEGORY</name>
         <text>Gestión Categorías</text>
         <route>category/index</route>
     </action>
     <action multiple="1">
-        <id>62</id>
+        <id>301</id>
         <name>CLIENT</name>
         <text>Gestión Clientes</text>
         <route>client/index</route>
     </action>
     <action multiple="1">
-        <id>63</id>
+        <id>1001</id>
         <name>AUTHTOKEN</name>
         <text>Gestión Autorizaciones API</text>
         <route>authToken/index</route>
     </action>
     <action multiple="1">
-        <id>64</id>
+        <id>401</id>
         <name>CUSTOMFIELD</name>
         <text>Gestión Campos Personalizados</text>
         <route>customField/index</route>
     </action>
     <action multiple="1">
-        <id>65</id>
+        <id>501</id>
         <name>PUBLICLINK</name>
         <text>Enlaces Públicos</text>
         <route>publicLink/index</route>
     </action>
     <action multiple="1">
-        <id>66</id>
+        <id>601</id>
         <name>FILE</name>
         <text>Gestión de Archivos</text>
         <route>file/index</route>
     </action>
     <action multiple="1">
-        <id>67</id>
+        <id>1301</id>
         <name>ACCOUNTMGR</name>
         <text>Gestión de Cuentas</text>
         <route>accountManager/index</route>
     </action>
     <action multiple="1">
-        <id>68</id>
+        <id>201</id>
         <name>TAG</name>
         <text>Gestión de Etiquetas</text>
         <route>tag/index</route>
     </action>
     <action multiple="1">
-        <id>69</id>
+        <id>1101</id>
         <name>PLUGIN</name>
         <text>Gestión Plugins</text>
         <route>plugin/index</route>
     </action>
     <action multiple="1">
-        <id>70</id>
+        <id>5002</id>
         <name>ACCESS_MANAGE</name>
         <text>Usuarios y Accesos</text>
         <route>accessManager/index</route>
     </action>
     <action multiple="1">
-        <id>71</id>
+        <id>701</id>
         <name>USER</name>
         <text>Gestión Usuarios</text>
         <route>user/index</route>
     </action>
     <action multiple="1">
-        <id>72</id>
+        <id>801</id>
         <name>GROUP</name>
         <text>Gestión Grupos</text>
         <route>group/index</route>
     </action>
     <action multiple="1">
-        <id>73</id>
+        <id>901</id>
         <name>PROFILE</name>
         <text>Gestión Perfiles</text>
         <route>profile/index</route>
     </action>
     <action multiple="1">
-        <id>90</id>
+        <id>1701</id>
         <name>EVENTLOG</name>
         <text>Registro de Eventos</text>
         <route>eventlog/index</route>
     </action>
     <action multiple="1">
-        <id>905</id>
+        <id>1702</id>
         <name>EVENTLOG_SEARCH</name>
         <text>Buscar Eventos</text>
         <route>eventlog/search</route>
     </action>
     <action multiple="1">
-        <id>906</id>
+        <id>1703</id>
         <name>EVENTLOG_CLEAR</name>
         <text>Limpiar Eventos</text>
         <route>eventlog/clear</route>
     </action>
     <action multiple="1">
-        <id>100</id>
+        <id>3</id>
         <name>ACCOUNT_VIEW</name>
         <text>Ver Cuenta</text>
         <route>account/view</route>
     </action>
     <action multiple="1">
-        <id>101</id>
+        <id>4</id>
         <name>ACCOUNT_CREATE</name>
         <text>Nueva Cuenta</text>
         <route>account/create</route>
     </action>
     <action multiple="1">
-        <id>102</id>
+        <id>5</id>
         <name>ACCOUNT_EDIT</name>
         <text>Editar Cuenta</text>
         <route>account/edit</route>
     </action>
     <action multiple="1">
-        <id>103</id>
+        <id>6</id>
         <name>ACCOUNT_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>account/delete</route>
     </action>
     <action multiple="1">
-        <id>104</id>
+        <id>7</id>
         <name>ACCOUNT_VIEW_PASS</name>
         <text>Ver Clave</text>
         <route>account/viewPass</route>
     </action>
     <action multiple="1">
-        <id>106</id>
+        <id>8</id>
         <name>ACCOUNT_EDIT_PASS</name>
         <text>Editar Clave de Cuenta</text>
         <route>account/editPass</route>
     </action>
     <action multiple="1">
-        <id>107</id>
+        <id>9</id>
         <name>ACCOUNT_EDIT_RESTORE</name>
         <text>Restaurar Cuenta</text>
         <route>account/restore</route>
     </action>
     <action multiple="1">
-        <id>108</id>
+        <id>10</id>
         <name>ACCOUNT_COPY</name>
         <text>Copiar Cuenta</text>
         <route>account/copy</route>
     </action>
     <action multiple="1">
-        <id>109</id>
+        <id>11</id>
         <name>ACCOUNT_COPY_PASS</name>
         <text>Copiar Clave</text>
         <route>account/copyPass</route>
     </action>
     <action multiple="1">
-        <id>111</id>
+        <id>21</id>
         <name>ACCOUNT_FILE_VIEW</name>
         <text>Ver Archivo</text>
         <route>accountFile/view</route>
     </action>
     <action multiple="1">
-        <id>112</id>
+        <id>22</id>
         <name>ACCOUNT_FILE_UPLOAD</name>
         <text>Subir Archivo</text>
         <route>accountFile/upload</route>
     </action>
     <action multiple="1">
-        <id>113</id>
+        <id>23</id>
         <name>ACCOUNT_FILE_DOWNLOAD</name>
         <text>Descargar Archivo</text>
         <route>accountFile/download</route>
     </action>
     <action multiple="1">
-        <id>114</id>
+        <id>24</id>
         <name>ACCOUNT_FILE_DELETE</name>
         <text>Eliminar Archivo</text>
         <route>accountFile/delete</route>
     </action>
     <action multiple="1">
-        <id>115</id>
+        <id>25</id>
         <name>ACCOUNT_FILE_SEARCH</name>
         <text>Buscar Archivos</text>
         <route>accountFile/search</route>
     </action>
     <action multiple="1">
-        <id>116</id>
+        <id>26</id>
         <name>ACCOUNT_FILE_LIST</name>
         <text>Listar Archivos</text>
         <route>accountFile/list</route>
     </action>
     <action multiple="1">
-        <id>130</id>
+        <id>31</id>
         <name>ACCOUNT_FAVORITE_VIEW</name>
         <text>Ver Favoritos</text>
         <route>favorite/view</route>
     </action>
     <action multiple="1">
-        <id>131</id>
+        <id>32</id>
         <name>ACCOUNT_FAVORITE_ADD</name>
         <text>Añadir Favorito</text>
         <route>accountFavorite/mark</route>
     </action>
     <action multiple="1">
-        <id>133</id>
+        <id>33</id>
         <name>ACCOUNT_FAVORITE_DELETE</name>
         <text>Eliminar Favorito</text>
         <route>accountFavorite/unmark</route>
     </action>
     <action multiple="1">
-        <id>140</id>
+        <id>40</id>
         <name>ACCOUNT_HISTORY_VIEW</name>
         <text>Ver Historial</text>
         <route>account/viewHistory</route>
     </action>
     <action multiple="1">
-        <id>141</id>
+        <id>41</id>
         <name>ACCOUNT_HISTORY_VIEW_PASS</name>
         <text>Ver Clave</text>
         <route>account/viewPassHistory</route>
     </action>
     <action multiple="1">
-        <id>142</id>
+        <id>42</id>
         <name>ACCOUNT_HISTORY_COPY_PASS</name>
         <text>Copiar Clave</text>
         <route>account/copyPassHistory</route>
     </action>
     <action multiple="1">
-        <id>200</id>
+        <id>1203</id>
         <name>WIKI_VIEW</name>
         <text>Ver Wiki</text>
         <route>wiki/view</route>
     </action>
     <action multiple="1">
-        <id>201</id>
-        <name>WIKI_NEW</name>
+        <id>1204</id>
+        <name>WIKI_CREATE</name>
         <text>Añadir Wiki</text>
         <route>wiki/create</route>
     </action>
     <action multiple="1">
-        <id>202</id>
+        <id>1205</id>
         <name>WIKI_EDIT</name>
         <text>Editar Wiki</text>
         <route>wiki/edit</route>
     </action>
     <action multiple="1">
-        <id>203</id>
+        <id>1206</id>
         <name>WIKI_DELETE</name>
         <text>Eliminar Wiki</text>
         <route>wiki/delete</route>
     </action>
     <action multiple="1">
-        <id>610</id>
+        <id>103</id>
         <name>CATEGORY_VIEW</name>
         <text>Ver Categoría</text>
         <route>category/view</route>
     </action>
     <action multiple="1">
-        <id>611</id>
+        <id>104</id>
         <name>CATEGORY_CREATE</name>
         <text>Nueva Categoría</text>
         <route>category/create</route>
     </action>
     <action multiple="1">
-        <id>612</id>
+        <id>105</id>
         <name>CATEGORY_EDIT</name>
         <text>Editar Categoría</text>
         <route>category/edit</route>
     </action>
     <action multiple="1">
-        <id>613</id>
+        <id>106</id>
         <name>CATEGORY_DELETE</name>
         <text>Eliminar Categoría</text>
         <route>category/delete</route>
     </action>
     <action multiple="1">
-        <id>615</id>
+        <id>102</id>
         <name>CATEGORY_SEARCH</name>
         <text>Buscar Categoría</text>
         <route>category/search</route>
     </action>
     <action multiple="1">
-        <id>620</id>
+        <id>303</id>
         <name>CLIENT_VIEW</name>
         <text>Ver Cliente</text>
         <route>client/view</route>
     </action>
     <action multiple="1">
-        <id>621</id>
+        <id>304</id>
         <name>CLIENT_CREATE</name>
         <text>Nuevo CLiente</text>
         <route>client/create</route>
     </action>
     <action multiple="1">
-        <id>622</id>
+        <id>305</id>
         <name>CLIENT_EDIT</name>
         <text>Editar Cliente</text>
         <route>client/edit</route>
     </action>
     <action multiple="1">
-        <id>623</id>
+        <id>306</id>
         <name>CLIENT_DELETE</name>
         <text>Eliminar Cliente</text>
         <route>client/delete</route>
     </action>
     <action multiple="1">
-        <id>625</id>
+        <id>302</id>
         <name>CLIENT_SEARCH</name>
         <text>Buscar Cliente</text>
         <route>client/search</route>
     </action>
     <action multiple="1">
-        <id>630</id>
+        <id>1004</id>
         <name>AUTHTOKEN_CREATE</name>
         <text>Nuevo Token API</text>
         <route>authToken/create</route>
     </action>
     <action multiple="1">
-        <id>631</id>
+        <id>1003</id>
         <name>AUTHTOKEN_VIEW</name>
         <text>Ver Token API</text>
         <route>authToken/view</route>
     </action>
     <action multiple="1">
-        <id>632</id>
+        <id>1005</id>
         <name>AUTHTOKEN_EDIT</name>
         <text>Editar Token API</text>
         <route>authToken/edit</route>
     </action>
     <action multiple="1">
-        <id>633</id>
+        <id>1006</id>
         <name>AUTHTOKEN_DELETE</name>
         <text>Eliminar Token API</text>
         <route>authToken/delete</route>
     </action>
     <action multiple="1">
-        <id>635</id>
+        <id>1002</id>
         <name>AUTHTOKEN_SEARCH</name>
         <text>Buscar Token API</text>
         <route>authToken/search</route>
     </action>
     <action multiple="1">
-        <id>640</id>
+        <id>404</id>
         <name>CUSTOMFIELD_CREATE</name>
         <text>Nuevo Campo Personalizado</text>
         <route>customField/create</route>
     </action>
     <action multiple="1">
-        <id>641</id>
+        <id>403</id>
         <name>CUSTOMFIELD_VIEW</name>
         <text>Ver Campo Personalizado</text>
         <route>customField/view</route>
     </action>
     <action multiple="1">
-        <id>642</id>
+        <id>405</id>
         <name>CUSTOMFIELD_EDIT</name>
         <text>Editar Campo Personalizado</text>
         <route>customField/edit</route>
     </action>
     <action multiple="1">
-        <id>643</id>
+        <id>406</id>
         <name>CUSTOMFIELD_DELETE</name>
         <text>Eliminar Campo Personalizado</text>
         <route>customField/delete</route>
     </action>
     <action multiple="1">
-        <id>645</id>
+        <id>402</id>
         <name>CUSTOMFIELD_SEARCH</name>
         <text>Buscar Campo Personalizado</text>
         <route>customField/search</route>
     </action>
     <action multiple="1">
-        <id>650</id>
+        <id>504</id>
         <name>PUBLICLINK_CREATE</name>
         <text>Crear Enlace Público</text>
         <route>publicLink/create</route>
     </action>
     <action multiple="1">
-        <id>651</id>
+        <id>503</id>
         <name>PUBLICLINK_VIEW</name>
         <text>Ver Enlace Público</text>
         <route>publicLink/view</route>
     </action>
     <action multiple="1">
-        <id>653</id>
+        <id>506</id>
         <name>PUBLICLINK_DELETE</name>
         <text>Eliminar Enlace Público</text>
         <route>publicLink/delete</route>
     </action>
     <action multiple="1">
-        <id>654</id>
+        <id>507</id>
         <name>PUBLICLINK_REFRESH</name>
         <text>Actualizar Enlace Público</text>
         <route>publicLink/refresh</route>
     </action>
     <action multiple="1">
-        <id>655</id>
+        <id>502</id>
         <name>PUBLICLINK_SEARCH</name>
         <text>Buscar Enlace Público</text>
         <route>publicLink/search</route>
     </action>
     <action multiple="1">
-        <id>661</id>
+        <id>603</id>
         <name>FILE_VIEW</name>
         <text>Ver Archivo</text>
         <route>file/view</route>
     </action>
     <action multiple="1">
-        <id>662</id>
+        <id>605</id>
         <name>FILE_DOWNLOAD</name>
         <text>Descargar Archivo</text>
         <route>file/download</route>
     </action>
     <action multiple="1">
-        <id>663</id>
+        <id>606</id>
         <name>FILE_DELETE</name>
         <text>Eliminar Archivo</text>
         <route>file/delete</route>
     </action>
     <action multiple="1">
-        <id>664</id>
+        <id>604</id>
         <name>FILE_UPLOAD</name>
         <text>Subir Archivo</text>
         <route>file/upload</route>
     </action>
     <action multiple="1">
-        <id>665</id>
+        <id>602</id>
         <name>FILE_SEARCH</name>
         <text>Buscar Archivo</text>
         <route>file/search</route>
     </action>
     <action multiple="1">
-        <id>671</id>
+        <id>1303</id>
         <name>ACCOUNTMGR_VIEW</name>
         <text>Ver Cuenta</text>
         <route>accountManager/view</route>
     </action>
     <action multiple="1">
-        <id>673</id>
+        <id>1304</id>
         <name>ACCOUNTMGR_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>accountManager/delete</route>
     </action>
     <action multiple="1">
-        <id>675</id>
+        <id>1302</id>
         <name>ACCOUNTMGR_SEARCH</name>
         <text>Buscar Cuenta</text>
         <route>accountManager/search</route>
     </action>
     <action multiple="1">
-        <id>680</id>
+        <id>204</id>
         <name>TAG_CREATE</name>
         <text>Nueva Etiqueta</text>
         <route>tag/create</route>
     </action>
     <action multiple="1">
-        <id>681</id>
+        <id>203</id>
         <name>TAG_VIEW</name>
         <text>Ver Etiqueta</text>
         <route>tag/view</route>
     </action>
     <action multiple="1">
-        <id>682</id>
+        <id>205</id>
         <name>TAG_EDIT</name>
         <text>Editar Etiqueta</text>
         <route>tag/edit</route>
     </action>
     <action multiple="1">
-        <id>683</id>
+        <id>206</id>
         <name>TAG_DELETE</name>
         <text>Eliminar Etiqueta</text>
         <route>tag/delete</route>
     </action>
     <action multiple="1">
-        <id>685</id>
+        <id>202</id>
         <name>TAG_SEARCH</name>
         <text>Buscar Etiqueta</text>
         <route>tag/search</route>
     </action>
     <action multiple="1">
-        <id>690</id>
-        <name>PLUGIN_NEW</name>
+        <id>1104</id>
+        <name>PLUGIN_CREATE</name>
         <text>Nuevo Plugin</text>
         <route>plugin/create</route>
     </action>
     <action multiple="1">
-        <id>691</id>
+        <id>1103</id>
         <name>PLUGIN_VIEW</name>
         <text>Ver Plugin</text>
         <route>plugin/view</route>
     </action>
     <action multiple="1">
-        <id>695</id>
+        <id>1102</id>
         <name>PLUGIN_SEARCH</name>
         <text>Buscar Plugin</text>
         <route>plugin/search</route>
     </action>
     <action multiple="1">
-        <id>696</id>
+        <id>1105</id>
         <name>PLUGIN_ENABLE</name>
         <text>Habilitar Plugin</text>
         <route>plugin/enable</route>
     </action>
     <action multiple="1">
-        <id>697</id>
+        <id>1106</id>
         <name>PLUGIN_DISABLE</name>
         <text>Deshabilitar Plugin</text>
         <route>plugin/disable</route>
     </action>
     <action multiple="1">
-        <id>698</id>
+        <id>1107</id>
         <name>PLUGIN_RESET</name>
         <text>Restablecer Plugin</text>
         <route>plugin/reset</route>
     </action>
     <action multiple="1">
-        <id>710</id>
+        <id>703</id>
         <name>USER_VIEW</name>
         <text>Ver Usuario</text>
         <route>user/view</route>
     </action>
     <action multiple="1">
-        <id>711</id>
+        <id>704</id>
         <name>USER_CREATE</name>
         <text>Nuevo Usuario</text>
         <route>user/create</route>
     </action>
     <action multiple="1">
-        <id>712</id>
+        <id>705</id>
         <name>USER_EDIT</name>
         <text>Editar Usuario</text>
         <route>user/edit</route>
     </action>
     <action multiple="1">
-        <id>713</id>
+        <id>706</id>
         <name>USER_DELETE</name>
         <text>Eliminar Usuario</text>
         <route>user/delete</route>
     </action>
     <action multiple="1">
-        <id>714</id>
+        <id>707</id>
         <name>USER_EDIT_PASS</name>
         <text>Editar Clave Usuario</text>
         <route>user/editPass</route>
     </action>
     <action multiple="1">
-        <id>715</id>
+        <id>702</id>
         <name>USER_SEARCH</name>
         <text>Buscar Usuario</text>
         <route>user/search</route>
     </action>
     <action multiple="1">
-        <id>720</id>
+        <id>803</id>
         <name>GROUP_VIEW</name>
         <text>Ver Grupo</text>
         <route>userGroup/view</route>
     </action>
     <action multiple="1">
-        <id>721</id>
+        <id>804</id>
         <name>GROUP_CREATE</name>
         <text>Nuevo Grupo</text>
         <route>userGroup/create</route>
     </action>
     <action multiple="1">
-        <id>722</id>
+        <id>805</id>
         <name>GROUP_EDIT</name>
         <text>Editar Grupo</text>
         <route>userGroup/edit</route>
     </action>
     <action multiple="1">
-        <id>723</id>
+        <id>806</id>
         <name>GROUP_DELETE</name>
         <text>Eliminar Grupo</text>
         <route>userGroup/delete</route>
     </action>
     <action multiple="1">
-        <id>725</id>
+        <id>802</id>
         <name>GROUP_SEARCH</name>
         <text>Buscar Grupo</text>
         <route>userGroup/search</route>
     </action>
     <action multiple="1">
-        <id>730</id>
+        <id>903</id>
         <name>PROFILE_VIEW</name>
         <text>Ver Perfil</text>
         <route>userProfile/view</route>
     </action>
     <action multiple="1">
-        <id>731</id>
+        <id>904</id>
         <name>PROFILE_CREATE</name>
         <text>Nuevo Perfil</text>
         <route>userProfile/create</route>
     </action>
     <action multiple="1">
-        <id>732</id>
+        <id>905</id>
         <name>PROFILE_EDIT</name>
         <text>Editar Perfil</text>
         <route>userProfile/edit</route>
     </action>
     <action multiple="1">
-        <id>733</id>
+        <id>906</id>
         <name>PROFILE_DELETE</name>
         <text>Eliminar Perfil</text>
         <route>userProfile/delete</route>
     </action>
     <action multiple="1">
-        <id>735</id>
+        <id>902</id>
         <name>PROFILE_SEARCH</name>
         <text>Buscar Perfil</text>
         <route>userProfile/search</route>
     </action>
     <action multiple="1">
-        <id>74</id>
+        <id>5010</id>
         <name>USERSETTINGS</name>
         <text>Configuración Usuario</text>
         <route>userSettingsManager/index</route>
     </action>
     <action multiple="1">
-        <id>741</id>
+        <id>5011</id>
         <name>USERSETTINGS_GENERAL</name>
         <text>Preferencias General</text>
         <route>userSettings/general</route>
     </action>
     <action multiple="1">
-        <id>76</id>
+        <id>1401</id>
         <name>NOTIFICATION</name>
         <text>Notificaciones</text>
         <route>notification/index</route>
     </action>
     <action multiple="1">
-        <id>1000</id>
+        <id>1501</id>
         <name>CONFIG</name>
         <text>Configuración</text>
         <route>configManager/index</route>
     </action>
     <action multiple="1">
-        <id>1001</id>
+        <id>1502</id>
         <name>CONFIG_GENERAL</name>
         <text>Configuración General</text>
         <route>configManager/general</route>
     </action>
     <action multiple="1">
-        <id>1010</id>
-        <name>ACCOUNT_CONFIG</name>
+        <id>1510</id>
+        <name>CONFIG_ACCOUNT</name>
         <text>Configuración Cuentas</text>
         <route>account/config</route>
     </action>
     <action multiple="1">
-        <id>1020</id>
-        <name>WIKI_CONFIG</name>
+        <id>1520</id>
+        <name>CONFIG_WIKI</name>
         <text>Configuración Wiki</text>
         <route>wiki/config</route>
     </action>
     <action multiple="1">
-        <id>1030</id>
-        <name>ENCRYPTION_CONFIG</name>
+        <id>1530</id>
+        <name>CONFIG_CRYPT</name>
         <text>Configuración Encriptación</text>
         <route>encryption/config</route>
     </action>
     <action multiple="1">
-        <id>1031</id>
-        <name>ENCRYPTION_REFRESH</name>
+        <id>1531</id>
+        <name>CONFIG_CRYPT_REFRESH</name>
         <text>Actualizar Hash</text>
         <route>encryption/updateHash</route>
     </action>
     <action multiple="1">
-        <id>1032</id>
-        <name>ENCRYPTION_TEMPPASS</name>
+        <id>1532</id>
+        <name>CONFIG_CRYPT_TEMPPASS</name>
         <text>Clave Maestra Temporal</text>
         <route>encryption/createTempPass</route>
     </action>
     <action multiple="1">
-        <id>1040</id>
-        <name>BACKUP_CONFIG</name>
+        <id>1540</id>
+        <name>CONFIG_BACKUP</name>
         <text>Configuración Copia de Seguridad</text>
         <route>backup/config</route>
     </action>
     <action multiple="1">
-        <id>1041</id>
-        <name>BACKUP</name>
+        <id>1541</id>
+        <name>CONFIG_BACKUP_RUN</name>
         <text>Copia de Seguridad</text>
         <route>backup/backup</route>
     </action>
     <action multiple="1">
-        <id>1050</id>
-        <name>IMPORT_CONFIG</name>
+        <id>1550</id>
+        <name>CONFIG_IMPORT</name>
         <text>Configuración Importación</text>
         <route>import/config</route>
     </action>
     <action multiple="1">
-        <id>1051</id>
-        <name>IMPORT_CSV</name>
+        <id>1551</id>
+        <name>CONFIG_IMPORT_CSV</name>
         <text>Importar CSV</text>
         <route>import/csv</route>
     </action>
     <action multiple="1">
-        <id>1052</id>
-        <name>IMPORT_XML</name>
+        <id>1552</id>
+        <name>CONFIG_IMPORT_XML</name>
         <text>Importar XML</text>
         <route>import/xml</route>
     </action>
     <action multiple="1">
-        <id>1060</id>
-        <name>EXPORT_CONFIG</name>
+        <id>1560</id>
+        <name>CONFIG_EXPORT</name>
         <text>Configuración Exportación</text>
         <route>export/config</route>
     </action>
     <action multiple="1">
-        <id>1061</id>
-        <name>EXPORT</name>
+        <id>1561</id>
+        <name>CONFIG_EXPORT_RUN</name>
         <text>Exportación</text>
         <route>export/export</route>
     </action>
     <action multiple="1">
-        <id>1070</id>
-        <name>MAIL_CONFIG</name>
+        <id>1570</id>
+        <name>CONFIG_MAIL</name>
         <text>Configuración Email</text>
         <route>mail/config</route>
     </action>
     <action multiple="1">
-        <id>1080</id>
-        <name>LDAP_CONFIG</name>
+        <id>1580</id>
+        <name>CONFIG_LDAP</name>
         <text>Configuración LDAP</text>
         <route>ldap/config</route>
     </action>
     <action multiple="1">
-        <id>1081</id>
-        <name>LDAP_SYNC</name>
+        <id>1581</id>
+        <name>CONFIG_LDAP_SYNC</name>
         <text>Sincronización LDAP</text>
         <route>ldap/sync</route>
     </action>
     <action multiple="1">
-        <id>6701</id>
+        <id>1311</id>
         <name>ACCOUNTMGR_HISTORY</name>
         <text>Gestión de Cuenta (H)</text>
         <route>accountHistoryManager/index</route>
     </action>
     <action multiple="1">
-        <id>6731</id>
-        <name>ACCOUNTMGR_DELETE_HISTORY</name>
+        <id>1314</id>
+        <name>ACCOUNTMGR_HISTORY_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>accountHistoryManager/delete</route>
     </action>
     <action multiple="1">
-        <id>6751</id>
-        <name>ACCOUNTMGR_SEARCH_HISTORY</name>
+        <id>1312</id>
+        <name>ACCOUNTMGR_HISTORY_SEARCH</name>
         <text>Buscar Cuenta</text>
         <route>accountHistoryManager/search</route>
     </action>
     <action multiple="1">
-        <id>6771</id>
-        <name>ACCOUNTMGR_RESTORE</name>
+        <id>1315</id>
+        <name>ACCOUNTMGR_HISTORY_RESTORE</name>
         <text>Restaurar Cuenta</text>
         <route>accountManager/restore</route>
     </action>
     <action multiple="1">
-        <id>760</id>
+        <id>1403</id>
         <name>NOTIFICATION_VIEW</name>
         <text>Ver Notificación</text>
         <route>notification/view</route>
     </action>
     <action multiple="1">
-        <id>761</id>
+        <id>1404</id>
         <name>NOTIFICATION_CREATE</name>
         <text>Crear Notificación</text>
         <route>notification/create</route>
     </action>
     <action multiple="1">
-        <id>762</id>
+        <id>1405</id>
         <name>NOTIFICATION_EDIT</name>
         <text>Editar Notificación</text>
         <route>notification/edit</route>
     </action>
     <action multiple="1">
-        <id>763</id>
+        <id>1406</id>
         <name>NOTIFICATION_DELETE</name>
         <text>Eliminar Notificación</text>
         <route>notification/delete</route>
     </action>
     <action multiple="1">
-        <id>764</id>
+        <id>1407</id>
         <name>NOTIFICATION_CHECK</name>
         <text>Marcar Notificación</text>
         <route>notification/check</route>
     </action>
     <action multiple="1">
-        <id>765</id>
+        <id>1402</id>
         <name>NOTIFICATION_SEARCH</name>
         <text>Buscar Notificación</text>
         <route>notification/search</route>
diff --git a/app/modules/api/Controllers/ConfigController.php b/app/modules/api/Controllers/ConfigController.php
index 73f07272..578b0353 100644
--- a/app/modules/api/Controllers/ConfigController.php
+++ b/app/modules/api/Controllers/ConfigController.php
@@ -47,7 +47,7 @@ final class ConfigController extends ControllerBase
     public function backupAction()
     {
         try {
-            $this->setupApi(ActionsInterface::BACKUP_CONFIG);
+            $this->setupApi(ActionsInterface::CONFIG_BACKUP);
 
             $this->dic->get(FileBackupService::class)
                 ->doBackup(BACKUP_PATH);
@@ -74,7 +74,7 @@ final class ConfigController extends ControllerBase
     public function exportAction()
     {
         try {
-            $this->setupApi(ActionsInterface::EXPORT_CONFIG);
+            $this->setupApi(ActionsInterface::CONFIG_EXPORT);
 
             $password = $this->apiService->getParamString('password');
 
diff --git a/app/modules/web/Controllers/AccountHistoryManagerController.php b/app/modules/web/Controllers/AccountHistoryManagerController.php
index bfa4f19d..6f425fa0 100644
--- a/app/modules/web/Controllers/AccountHistoryManagerController.php
+++ b/app/modules/web/Controllers/AccountHistoryManagerController.php
@@ -53,7 +53,7 @@ final class AccountHistoryManagerController extends ControllerBase
      */
     public function searchAction()
     {
-        if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR_SEARCH_HISTORY)) {
+        if (!$this->acl->checkUserAccess(Acl::ACCOUNTMGR_HISTORY_SEARCH)) {
             return;
         }
 
diff --git a/app/modules/web/Controllers/ConfigAccountController.php b/app/modules/web/Controllers/ConfigAccountController.php
index b6ae9f38..325f529c 100644
--- a/app/modules/web/Controllers/ConfigAccountController.php
+++ b/app/modules/web/Controllers/ConfigAccountController.php
@@ -111,7 +111,7 @@ final class ConfigAccountController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(ActionsInterface::ACCOUNT_CONFIG);
+            $this->checkAccess(ActionsInterface::CONFIG_ACCOUNT);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigBackupController.php b/app/modules/web/Controllers/ConfigBackupController.php
index 6ddee5b3..a39719ff 100644
--- a/app/modules/web/Controllers/ConfigBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackupController.php
@@ -140,7 +140,7 @@ final class ConfigBackupController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::BACKUP_CONFIG);
+            $this->checkAccess(Acl::CONFIG_BACKUP);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigEncryptionController.php b/app/modules/web/Controllers/ConfigEncryptionController.php
index 6a1e9651..88b7de7a 100644
--- a/app/modules/web/Controllers/ConfigEncryptionController.php
+++ b/app/modules/web/Controllers/ConfigEncryptionController.php
@@ -210,7 +210,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::ENCRYPTION_CONFIG);
+            $this->checkAccess(Acl::CONFIG_CRYPT);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigImportController.php b/app/modules/web/Controllers/ConfigImportController.php
index 78612439..9f419819 100644
--- a/app/modules/web/Controllers/ConfigImportController.php
+++ b/app/modules/web/Controllers/ConfigImportController.php
@@ -97,7 +97,7 @@ final class ConfigImportController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::IMPORT_CONFIG);
+            $this->checkAccess(Acl::CONFIG_IMPORT);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigLdapController.php b/app/modules/web/Controllers/ConfigLdapController.php
index 71dfe2b2..6f1c8b04 100644
--- a/app/modules/web/Controllers/ConfigLdapController.php
+++ b/app/modules/web/Controllers/ConfigLdapController.php
@@ -279,7 +279,7 @@ final class ConfigLdapController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::LDAP_CONFIG);
+            $this->checkAccess(Acl::CONFIG_LDAP);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigMailController.php b/app/modules/web/Controllers/ConfigMailController.php
index e9cf05b9..334e3145 100644
--- a/app/modules/web/Controllers/ConfigMailController.php
+++ b/app/modules/web/Controllers/ConfigMailController.php
@@ -157,7 +157,7 @@ final class ConfigMailController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::MAIL_CONFIG);
+            $this->checkAccess(Acl::CONFIG_MAIL);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php
index b55e7d50..4d6beda3 100644
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -84,31 +84,31 @@ final class ConfigManagerController extends ControllerBase
             $this->tabsHelper->addTab($this->getConfigGeneral());
         }
 
-        if ($this->checkAccess(Acl::ACCOUNT_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_ACCOUNT)) {
             $this->tabsHelper->addTab($this->getAccountConfig());
         }
 
-        if ($this->checkAccess(Acl::WIKI_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_WIKI)) {
             $this->tabsHelper->addTab($this->getWikiConfig());
         }
 
-        if ($this->checkAccess(Acl::LDAP_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_LDAP)) {
             $this->tabsHelper->addTab($this->getLdapConfig());
         }
 
-        if ($this->checkAccess(Acl::MAIL_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_MAIL)) {
             $this->tabsHelper->addTab($this->getMailConfig());
         }
 
-        if ($this->checkAccess(Acl::ENCRYPTION_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_CRYPT)) {
             $this->tabsHelper->addTab($this->getEncryptionConfig());
         }
 
-        if ($this->checkAccess(Acl::BACKUP_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_BACKUP)) {
             $this->tabsHelper->addTab($this->getBackupConfig());
         }
 
-        if ($this->checkAccess(Acl::IMPORT_CONFIG)) {
+        if ($this->checkAccess(Acl::CONFIG_IMPORT)) {
             $this->tabsHelper->addTab($this->getImportConfig());
         }
 
diff --git a/app/modules/web/Controllers/ConfigWikiController.php b/app/modules/web/Controllers/ConfigWikiController.php
index 7c50f6c3..7e67a762 100644
--- a/app/modules/web/Controllers/ConfigWikiController.php
+++ b/app/modules/web/Controllers/ConfigWikiController.php
@@ -113,7 +113,7 @@ final class ConfigWikiController extends SimpleControllerBase
     {
         try {
             $this->checks();
-            $this->checkAccess(Acl::WIKI_CONFIG);
+            $this->checkAccess(Acl::CONFIG_WIKI);
         } catch (UnauthorizedPageException $e) {
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
 
diff --git a/app/modules/web/Controllers/Helpers/ItemsGridHelper.php b/app/modules/web/Controllers/Helpers/ItemsGridHelper.php
index abe13819..c689c667 100644
--- a/app/modules/web/Controllers/Helpers/ItemsGridHelper.php
+++ b/app/modules/web/Controllers/Helpers/ItemsGridHelper.php
@@ -525,35 +525,35 @@ final class ItemsGridHelper extends HelperBase
 
         // Grid Actions
         $GridActionSearch = new DataGridActionSearch();
-        $GridActionSearch->setId(ActionsInterface::ACCOUNTMGR_SEARCH_HISTORY);
+        $GridActionSearch->setId(ActionsInterface::ACCOUNTMGR_HISTORY_SEARCH);
         $GridActionSearch->setType(DataGridActionType::SEARCH_ITEM);
         $GridActionSearch->setName('frmSearchAccountHistory');
         $GridActionSearch->setTitle(__('Buscar Cuenta'));
         $GridActionSearch->setOnSubmitFunction('appMgmt/search');
-        $GridActionSearch->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_SEARCH_HISTORY));
+        $GridActionSearch->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_HISTORY_SEARCH));
 
         $Grid->setDataActions($GridActionSearch);
         $Grid->setPager($this->getPager($GridActionSearch));
 
         // Grid item's actions
         $GridActionRestore = new DataGridAction();
-        $GridActionRestore->setId(ActionsInterface::ACCOUNTMGR_RESTORE);
+        $GridActionRestore->setId(ActionsInterface::ACCOUNTMGR_HISTORY_RESTORE);
         $GridActionRestore->setType(DataGridActionType::EDIT_ITEM);
         $GridActionRestore->setName(__('Restaurar Cuenta'));
         $GridActionRestore->setTitle(__('Restaurar Cuenta'));
         $GridActionRestore->setIcon($this->icons->getIconRestore());
-        $GridActionRestore->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_RESTORE));
+        $GridActionRestore->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_HISTORY_RESTORE));
 
 //        $Grid->setDataActions($GridActionRestore);
 
         $GridActionDel = new DataGridAction();
-        $GridActionDel->setId(ActionsInterface::ACCOUNTMGR_DELETE_HISTORY);
+        $GridActionDel->setId(ActionsInterface::ACCOUNTMGR_HISTORY_DELETE);
         $GridActionDel->setType(DataGridActionType::DELETE_ITEM);
         $GridActionDel->setName(__('Eliminar Cuenta'));
         $GridActionDel->setTitle(__('Eliminar Cuenta'));
         $GridActionDel->setIcon($this->icons->getIconDelete());
         $GridActionDel->setOnClickFunction('appMgmt/delete');
-        $GridActionDel->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_DELETE_HISTORY));
+        $GridActionDel->addData('action-route', Acl::getActionRoute(ActionsInterface::ACCOUNTMGR_HISTORY_DELETE));
 
         $Grid->setDataActions($GridActionDel);
         $Grid->setDataActions($GridActionDel, true);
@@ -623,18 +623,18 @@ final class ItemsGridHelper extends HelperBase
 
         $Grid->setDataActions($GridActionNew);
 
-        if ($this->acl->checkUserAccess(ActionsInterface::IMPORT_CONFIG)
+        if ($this->acl->checkUserAccess(ActionsInterface::CONFIG_IMPORT)
             && $this->configData->isLdapEnabled()
         ) {
             $GridActionLdapSync = new DataGridAction();
-            $GridActionLdapSync->setId(ActionsInterface::LDAP_SYNC);
+            $GridActionLdapSync->setId(ActionsInterface::CONFIG_LDAP_SYNC);
             $GridActionLdapSync->setType(DataGridActionType::MENUBAR_ITEM);
             $GridActionLdapSync->setName(__('Importar usuarios de LDAP'));
             $GridActionLdapSync->setTitle(__('Importar usuarios de LDAP'));
             $GridActionLdapSync->setIcon(new FontIcon('get_app'));
             $GridActionLdapSync->setSkip(true);
             $GridActionLdapSync->setOnClickFunction('appMgmt/ldapSync');
-            $GridActionLdapSync->addData('action-route', Acl::getActionRoute(ActionsInterface::LDAP_SYNC));
+            $GridActionLdapSync->addData('action-route', Acl::getActionRoute(ActionsInterface::CONFIG_LDAP_SYNC));
 
             $Grid->setDataActions($GridActionLdapSync);
         }
diff --git a/app/modules/web/Controllers/UpgradeController.php b/app/modules/web/Controllers/UpgradeController.php
index ca61f325..4d80589f 100644
--- a/app/modules/web/Controllers/UpgradeController.php
+++ b/app/modules/web/Controllers/UpgradeController.php
@@ -24,6 +24,7 @@
 
 namespace SP\Modules\Web\Controllers;
 
+use SP\Core\Acl\Actions;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -43,12 +44,16 @@ final class UpgradeController extends ControllerBase
 
     /**
      * indexAction
+     *
+     * @throws \SP\Storage\File\FileException
      */
     public function indexAction()
     {
         $layoutHelper = $this->dic->get(LayoutHelper::class);
         $layoutHelper->getPublicLayout('index', 'upgrade');
 
+        $this->dic->get(Actions::class)->reset();
+
         $this->view();
     }
 
diff --git a/lib/SP/Core/Acl/Acl.php b/lib/SP/Core/Acl/Acl.php
index f2aecd50..a0da9e93 100644
--- a/lib/SP/Core/Acl/Acl.php
+++ b/lib/SP/Core/Acl/Acl.php
@@ -107,12 +107,9 @@ final class Acl implements ActionsInterface
 
     /**
      * Comprobar los permisos de acceso del usuario a los módulos de la aplicación.
-     * Esta función comprueba los permisos del usuario para realizar una acción.
-     * Si los permisos ya han sido obtenidos desde la BBDD, se utiliza el objeto creado
-     * en la variable de sesión.
      *
-     * @param string $action con el nombre de la acción
-     * @param int    $userId opcional, con el Id del usuario
+     * @param int $action con el Id de la acción
+     * @param int $userId opcional, con el Id del usuario
      *
      * @return bool
      */
@@ -148,17 +145,27 @@ final class Acl implements ActionsInterface
             case self::ACCOUNT_FILE:
                 return ($userData->getIsAdminAcc() || $userProfile->isAccFiles());
             case self::ITEMS_MANAGE:
-                return ($userProfile->isMgmCategories() || $userProfile->isMgmCustomers());
+                return ($userData->getIsAdminAcc()
+                    || $userProfile->isMgmCategories()
+                    || $userProfile->isMgmCustomers()
+                    || $userProfile->isMgmAccounts()
+                    || $userProfile->isMgmFiles()
+                    || $userProfile->isMgmTags()
+                    || $userProfile->isMgmCustomFields()
+                    || $userProfile->isMgmPublicLinks());
             case self::CONFIG:
-                return ($userProfile->isConfigGeneral() || $userProfile->isConfigEncryption() || $userProfile->isConfigBackup() || $userProfile->isConfigImport());
+                return ($userProfile->isConfigGeneral()
+                    || $userProfile->isConfigEncryption()
+                    || $userProfile->isConfigBackup()
+                    || $userProfile->isConfigImport());
             case self::CONFIG_GENERAL:
             case self::PLUGIN:
-            case self::ACCOUNT_CONFIG:
-            case self::WIKI_CONFIG:
-            case self::LDAP_CONFIG:
-            case self::MAIL_CONFIG:
+            case self::CONFIG_ACCOUNT:
+            case self::CONFIG_WIKI:
+            case self::CONFIG_LDAP:
+            case self::CONFIG_MAIL:
                 return $userProfile->isConfigGeneral();
-            case self::IMPORT_CONFIG:
+            case self::CONFIG_IMPORT:
                 return $userProfile->isConfigImport();
             case self::CATEGORY:
             case self::CATEGORY_SEARCH:
@@ -193,8 +200,8 @@ final class Acl implements ActionsInterface
             case self::ACCOUNTMGR:
             case self::ACCOUNTMGR_SEARCH:
             case self::ACCOUNTMGR_HISTORY:
-            case self::ACCOUNTMGR_SEARCH_HISTORY:
-                return $userProfile->isMgmAccounts();
+            case self::ACCOUNTMGR_HISTORY_SEARCH:
+                return ($userData->getIsAdminAcc() || $userProfile->isMgmAccounts());
             case self::FILE:
             case self::FILE_SEARCH:
             case self::FILE_DELETE:
@@ -208,12 +215,15 @@ final class Acl implements ActionsInterface
             case self::TAG_EDIT:
             case self::TAG_DELETE:
                 return $userProfile->isMgmTags();
-            case self::ENCRYPTION_CONFIG:
+            case self::CONFIG_CRYPT:
                 return $userProfile->isConfigEncryption();
-            case self::BACKUP_CONFIG:
+            case self::CONFIG_BACKUP:
                 return $userProfile->isConfigBackup();
             case self::ACCESS_MANAGE:
-                return ($userProfile->isMgmUsers() || $userProfile->isMgmGroups() || $userProfile->isMgmProfiles());
+                return ($userProfile->isMgmUsers()
+                    || $userProfile->isMgmGroups()
+                    || $userProfile->isMgmProfiles()
+                    || $userProfile->isMgmApiTokens());
             case self::USER:
             case self::USER_SEARCH:
             case self::USER_VIEW:
diff --git a/lib/SP/Core/Acl/Actions.php b/lib/SP/Core/Acl/Actions.php
index 79fb46a9..f502530b 100644
--- a/lib/SP/Core/Acl/Actions.php
+++ b/lib/SP/Core/Acl/Actions.php
@@ -67,7 +67,7 @@ final class Actions
      * @param FileStorageInterface                     $fileStorage
      * @param \SP\Storage\File\XmlFileStorageInterface $xmlFileStorage
      *
-     * @throws \SP\Core\Exceptions\FileNotFoundException
+     * @throws FileException
      */
     public function __construct(FileStorageInterface $fileStorage, XmlFileStorageInterface $xmlFileStorage)
     {
@@ -81,7 +81,7 @@ final class Actions
      * Loads actions from cache file
      *
      * @return void
-     * @throws \SP\Core\Exceptions\FileNotFoundException
+     * @throws FileException
      */
     protected function loadCache()
     {
@@ -101,7 +101,7 @@ final class Actions
     }
 
     /**
-     * @throws \SP\Core\Exceptions\FileNotFoundException
+     * @throws FileException
      */
     protected function mapAndSave()
     {
@@ -114,20 +114,18 @@ final class Actions
     /**
      * Sets an array of actions using id as key
      *
-     * @throws \SP\Core\Exceptions\FileNotFoundException
+     * @throws FileException
      */
     protected function map()
     {
         $this->actions = [];
 
-        $actionBase = new ActionData();
-
         foreach ($this->load() as $a) {
             if (isset($this->actions[$a['id']])) {
                 throw new \RuntimeException('Duplicated action id: ' . $a['id']);
             }
 
-            $action = clone $actionBase;
+            $action = new ActionData();
             $action->id = $a['id'];
             $action->name = $a['name'];
             $action->text = $a['text'];
@@ -178,4 +176,14 @@ final class Actions
 
         return $this->actions[$id];
     }
+
+    /**
+     * @throws FileException
+     */
+    public function reset()
+    {
+        @unlink(self::ACTIONS_CACHE_FILE);
+
+        $this->loadCache();
+    }
 }
\ No newline at end of file
diff --git a/lib/SP/Core/Acl/ActionsInterface.php b/lib/SP/Core/Acl/ActionsInterface.php
index 72b4cb56..23c0891e 100644
--- a/lib/SP/Core/Acl/ActionsInterface.php
+++ b/lib/SP/Core/Acl/ActionsInterface.php
@@ -31,142 +31,146 @@ namespace SP\Core\Acl;
  */
 interface ActionsInterface
 {
-    const ACCOUNT_SEARCH = 1;
-    const ACCOUNT = 10;
-    const ACCOUNT_VIEW = 100;
-    const ACCOUNT_CREATE = 101;
-    const ACCOUNT_EDIT = 102;
-    const ACCOUNT_DELETE = 103;
-    const ACCOUNT_VIEW_PASS = 104;
-    const ACCOUNT_EDIT_PASS = 106;
-    const ACCOUNT_EDIT_RESTORE = 107;
-    const ACCOUNT_COPY = 108;
-    const ACCOUNT_COPY_PASS = 109;
-    const ACCOUNT_FILE = 11;
-    const ACCOUNT_FILE_VIEW = 111;
-    const ACCOUNT_FILE_UPLOAD = 112;
-    const ACCOUNT_FILE_DOWNLOAD = 113;
-    const ACCOUNT_FILE_DELETE = 114;
-    const ACCOUNT_FILE_SEARCH = 115;
-    const ACCOUNT_FILE_LIST = 116;
+    const ACCOUNT = 1;
+    const ACCOUNT_SEARCH = 2;
+    const ACCOUNT_VIEW = 3;
+    const ACCOUNT_CREATE = 4;
+    const ACCOUNT_EDIT = 5;
+    const ACCOUNT_DELETE = 6;
+    const ACCOUNT_VIEW_PASS = 7;
+    const ACCOUNT_EDIT_PASS = 8;
+    const ACCOUNT_EDIT_RESTORE = 9;
+    const ACCOUNT_COPY = 10;
+    const ACCOUNT_COPY_PASS = 11;
     const ACCOUNT_REQUEST = 12;
-    const ACCOUNT_FAVORITE = 13;
-    const ACCOUNT_FAVORITE_VIEW = 130;
-    const ACCOUNT_FAVORITE_ADD = 131;
-    const ACCOUNT_FAVORITE_DELETE = 133;
-    const ACCOUNT_HISTORY_VIEW = 140;
-    const ACCOUNT_HISTORY_VIEW_PASS = 141;
-    const ACCOUNT_HISTORY_COPY_PASS = 142;
-    const WIKI = 20;
-    const WIKI_VIEW = 200;
-    const WIKI_NEW = 201;
-    const WIKI_EDIT = 202;
-    const WIKI_DELETE = 203;
-    const ITEMS_MANAGE = 60;
-    const CATEGORY = 61;
-    const CATEGORY_VIEW = 610;
-    const CATEGORY_CREATE = 611;
-    const CATEGORY_EDIT = 612;
-    const CATEGORY_DELETE = 613;
-    const CATEGORY_SEARCH = 615;
-    const CLIENT = 62;
-    const CLIENT_VIEW = 620;
-    const CLIENT_CREATE = 621;
-    const CLIENT_EDIT = 622;
-    const CLIENT_DELETE = 623;
-    const CLIENT_SEARCH = 625;
-    const AUTHTOKEN = 63;
-    const AUTHTOKEN_CREATE = 630;
-    const AUTHTOKEN_VIEW = 631;
-    const AUTHTOKEN_EDIT = 632;
-    const AUTHTOKEN_DELETE = 633;
-    const AUTHTOKEN_SEARCH = 635;
-    const CUSTOMFIELD = 64;
-    const CUSTOMFIELD_CREATE = 640;
-    const CUSTOMFIELD_VIEW = 641;
-    const CUSTOMFIELD_EDIT = 642;
-    const CUSTOMFIELD_DELETE = 643;
-    const CUSTOMFIELD_VIEW_PASS = 644;
-    const CUSTOMFIELD_SEARCH = 645;
-    const PUBLICLINK = 65;
-    const PUBLICLINK_CREATE = 650;
-    const PUBLICLINK_VIEW = 651;
-    const PUBLICLINK_EDIT = 652;
-    const PUBLICLINK_DELETE = 653;
-    const PUBLICLINK_REFRESH = 654;
-    const PUBLICLINK_SEARCH = 655;
-    const FILE = 66;
-    const FILE_VIEW = 661;
-    const FILE_DOWNLOAD = 662;
-    const FILE_DELETE = 663;
-    const FILE_UPLOAD = 664;
-    const FILE_SEARCH = 665;
-    const ACCOUNTMGR = 67;
-    const ACCOUNTMGR_HISTORY = 6701;
-    const ACCOUNTMGR_VIEW = 671;
-    const ACCOUNTMGR_DELETE = 673;
-    const ACCOUNTMGR_DELETE_HISTORY = 6731;
-    const ACCOUNTMGR_SEARCH = 675;
-    const ACCOUNTMGR_SEARCH_HISTORY = 6751;
-    const ACCOUNTMGR_RESTORE = 6771;
-    const TAG = 68;
-    const TAG_CREATE = 680;
-    const TAG_VIEW = 681;
-    const TAG_EDIT = 682;
-    const TAG_DELETE = 683;
-    const TAG_SEARCH = 685;
-    const PLUGIN = 69;
-    const PLUGIN_NEW = 690;
-    const PLUGIN_VIEW = 691;
-    const PLUGIN_SEARCH = 695;
-    const PLUGIN_ENABLE = 696;
-    const PLUGIN_DISABLE = 697;
-    const PLUGIN_RESET = 698;
-    const ACCESS_MANAGE = 70;
-    const USER = 71;
-    const USER_VIEW = 710;
-    const USER_CREATE = 711;
-    const USER_EDIT = 712;
-    const USER_DELETE = 713;
-    const USER_EDIT_PASS = 714;
-    const USER_SEARCH = 715;
-    const GROUP = 72;
-    const GROUP_VIEW = 720;
-    const GROUP_CREATE = 721;
-    const GROUP_EDIT = 722;
-    const GROUP_DELETE = 723;
-    const GROUP_SEARCH = 725;
-    const PROFILE = 73;
-    const PROFILE_VIEW = 730;
-    const PROFILE_CREATE = 731;
-    const PROFILE_EDIT = 732;
-    const PROFILE_DELETE = 733;
-    const PROFILE_SEARCH = 735;
-    const USERSETTINGS = 74;
-    const USERSETTINGS_GENERAL = 741;
-    const NOTIFICATION = 76;
-    const NOTIFICATION_VIEW = 760;
-    const NOTIFICATION_CREATE = 761;
-    const NOTIFICATION_EDIT = 762;
-    const NOTIFICATION_DELETE = 763;
-    const NOTIFICATION_CHECK = 764;
-    const NOTIFICATION_SEARCH = 765;
-    const CONFIG = 1000;
-    const CONFIG_GENERAL = 1001;
-    const ACCOUNT_CONFIG = 1010;
-    const WIKI_CONFIG = 1020;
-    const ENCRYPTION_CONFIG = 1030;
-    const ENCRYPTION_REFRESH = 1031;
-    const ENCRYPTION_TEMPPASS = 1032;
-    const BACKUP_CONFIG = 1040;
-    const BACKUP = 1041;
-    const IMPORT_CONFIG = 1050;
-    const EXPORT_CONFIG = 1060;
-    const EXPORT = 1061;
-    const MAIL_CONFIG = 1070;
-    const LDAP_CONFIG = 1080;
-    const LDAP_SYNC = 1081;
-    const EVENTLOG = 90;
-    const EVENTLOG_SEARCH = 905;
-    const EVENTLOG_CLEAR = 906;
+    const ACCOUNT_FILE = 20;
+    const ACCOUNT_FILE_VIEW = 21;
+    const ACCOUNT_FILE_UPLOAD = 22;
+    const ACCOUNT_FILE_DOWNLOAD = 23;
+    const ACCOUNT_FILE_DELETE = 24;
+    const ACCOUNT_FILE_SEARCH = 25;
+    const ACCOUNT_FILE_LIST = 26;
+    const ACCOUNT_FAVORITE = 30;
+    const ACCOUNT_FAVORITE_VIEW = 31;
+    const ACCOUNT_FAVORITE_ADD = 32;
+    const ACCOUNT_FAVORITE_DELETE = 33;
+    const ACCOUNT_HISTORY_VIEW = 40;
+    const ACCOUNT_HISTORY_VIEW_PASS = 41;
+    const ACCOUNT_HISTORY_COPY_PASS = 42;
+    const CATEGORY = 101;
+    const CATEGORY_SEARCH = 102;
+    const CATEGORY_VIEW = 103;
+    const CATEGORY_CREATE = 104;
+    const CATEGORY_EDIT = 105;
+    const CATEGORY_DELETE = 106;
+    const TAG = 201;
+    const TAG_SEARCH = 202;
+    const TAG_VIEW = 203;
+    const TAG_CREATE = 204;
+    const TAG_EDIT = 205;
+    const TAG_DELETE = 206;
+    const CLIENT = 301;
+    const CLIENT_SEARCH = 302;
+    const CLIENT_VIEW = 303;
+    const CLIENT_CREATE = 304;
+    const CLIENT_EDIT = 305;
+    const CLIENT_DELETE = 306;
+    const CUSTOMFIELD = 401;
+    const CUSTOMFIELD_SEARCH = 402;
+    const CUSTOMFIELD_VIEW = 403;
+    const CUSTOMFIELD_CREATE = 404;
+    const CUSTOMFIELD_EDIT = 405;
+    const CUSTOMFIELD_DELETE = 406;
+    const CUSTOMFIELD_VIEW_PASS = 407;
+    const PUBLICLINK = 501;
+    const PUBLICLINK_SEARCH = 502;
+    const PUBLICLINK_VIEW = 503;
+    const PUBLICLINK_CREATE = 504;
+    const PUBLICLINK_EDIT = 505;
+    const PUBLICLINK_DELETE = 506;
+    const PUBLICLINK_REFRESH = 507;
+    const FILE = 601;
+    const FILE_SEARCH = 602;
+    const FILE_VIEW = 603;
+    const FILE_UPLOAD = 604;
+    const FILE_DOWNLOAD = 605;
+    const FILE_DELETE = 606;
+    const USER = 701;
+    const USER_SEARCH = 702;
+    const USER_VIEW = 703;
+    const USER_CREATE = 704;
+    const USER_EDIT = 705;
+    const USER_DELETE = 706;
+    const USER_EDIT_PASS = 707;
+    const GROUP = 801;
+    const GROUP_SEARCH = 802;
+    const GROUP_VIEW = 803;
+    const GROUP_CREATE = 804;
+    const GROUP_EDIT = 805;
+    const GROUP_DELETE = 806;
+    const PROFILE = 901;
+    const PROFILE_SEARCH = 902;
+    const PROFILE_VIEW = 903;
+    const PROFILE_CREATE = 904;
+    const PROFILE_EDIT = 905;
+    const PROFILE_DELETE = 906;
+    const AUTHTOKEN = 1001;
+    const AUTHTOKEN_SEARCH = 1002;
+    const AUTHTOKEN_VIEW = 1003;
+    const AUTHTOKEN_CREATE = 1004;
+    const AUTHTOKEN_EDIT = 1005;
+    const AUTHTOKEN_DELETE = 1006;
+    const PLUGIN = 1101;
+    const PLUGIN_SEARCH = 1102;
+    const PLUGIN_VIEW = 1103;
+    const PLUGIN_CREATE = 1104;
+    const PLUGIN_ENABLE = 1105;
+    const PLUGIN_DISABLE = 1106;
+    const PLUGIN_RESET = 1107;
+    const WIKI = 1201;
+    const WIKI_SEARCH = 1202;
+    const WIKI_VIEW = 1203;
+    const WIKI_CREATE = 1204;
+    const WIKI_EDIT = 1205;
+    const WIKI_DELETE = 1206;
+    const ACCOUNTMGR = 1301;
+    const ACCOUNTMGR_SEARCH = 1302;
+    const ACCOUNTMGR_VIEW = 1303;
+    const ACCOUNTMGR_DELETE = 1304;
+    const ACCOUNTMGR_HISTORY = 1311;
+    const ACCOUNTMGR_HISTORY_SEARCH = 1312;
+    const ACCOUNTMGR_HISTORY_VIEW = 1313;
+    const ACCOUNTMGR_HISTORY_DELETE = 1314;
+    const ACCOUNTMGR_HISTORY_RESTORE = 1315;
+    const NOTIFICATION = 1401;
+    const NOTIFICATION_SEARCH = 1402;
+    const NOTIFICATION_VIEW = 1403;
+    const NOTIFICATION_CREATE = 1404;
+    const NOTIFICATION_EDIT = 1405;
+    const NOTIFICATION_DELETE = 1406;
+    const NOTIFICATION_CHECK = 1407;
+    const CONFIG = 1501;
+    const CONFIG_GENERAL = 1502;
+    const CONFIG_ACCOUNT = 1510;
+    const CONFIG_WIKI = 1520;
+    const CONFIG_CRYPT = 1530;
+    const CONFIG_CRYPT_REFRESH = 1531;
+    const CONFIG_CRYPT_TEMPPASS = 1532;
+    const CONFIG_BACKUP = 1540;
+    const CONFIG_BACKUP_RUN = 1541;
+    const CONFIG_IMPORT = 1550;
+    const CONFIG_IMPORT_CSV = 1551;
+    const CONFIG_IMPORT_XML = 1552;
+    const CONFIG_EXPORT = 1560;
+    const CONFIG_EXPORT_RUN = 1561;
+    const CONFIG_MAIL = 1570;
+    const CONFIG_LDAP = 1580;
+    const CONFIG_LDAP_SYNC = 1581;
+    const EVENTLOG = 1701;
+    const EVENTLOG_SEARCH = 1702;
+    const EVENTLOG_CLEAR = 1703;
+    const ITEMS_MANAGE = 5001;
+    const ACCESS_MANAGE = 5002;
+    const USERSETTINGS = 5010;
+    const USERSETTINGS_GENERAL = 5011;
 }
\ No newline at end of file
diff --git a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
index cbe6df33..f8593dca 100644
--- a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
+++ b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
@@ -95,11 +95,30 @@ final class AuthTokenRepository extends Repository implements RepositoryItemInte
     /**
      * Returns all the items
      *
-     * @return mixed
+     * @return QueryResult
+     *
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
      */
     public function getAll()
     {
-        throw new \RuntimeException('Not implemented');
+        $query = /** @lang SQL */
+            'SELECT id,
+            userId,
+            actionId,
+            createdBy,
+            startDate,
+            vault,
+            token,
+            `hash` 
+            FROM AuthToken
+            ORDER BY actionId, userId';
+
+        $queryData = new QueryData();
+        $queryData->setMapClassName(AuthTokenData::class);
+        $queryData->setQuery($query);
+
+        return $this->db->doSelect($queryData);
     }
 
     /**
diff --git a/lib/SP/Services/AuthToken/AuthTokenService.php b/lib/SP/Services/AuthToken/AuthTokenService.php
index 06dff51f..cd1c120e 100644
--- a/lib/SP/Services/AuthToken/AuthTokenService.php
+++ b/lib/SP/Services/AuthToken/AuthTokenService.php
@@ -81,8 +81,8 @@ final class AuthTokenService extends Service
             ActionsInterface::TAG_CREATE => Acl::getActionInfo(ActionsInterface::TAG_CREATE),
             ActionsInterface::TAG_EDIT => Acl::getActionInfo(ActionsInterface::TAG_EDIT),
             ActionsInterface::TAG_DELETE => Acl::getActionInfo(ActionsInterface::TAG_DELETE),
-            ActionsInterface::BACKUP => Acl::getActionInfo(ActionsInterface::BACKUP),
-            ActionsInterface::EXPORT => Acl::getActionInfo(ActionsInterface::EXPORT)
+            ActionsInterface::CONFIG_BACKUP_RUN => Acl::getActionInfo(ActionsInterface::CONFIG_BACKUP_RUN),
+            ActionsInterface::CONFIG_EXPORT_RUN => Acl::getActionInfo(ActionsInterface::CONFIG_EXPORT_RUN)
         ];
 
         return $actions;
@@ -259,6 +259,20 @@ final class AuthTokenService extends Service
         }
     }
 
+    /**
+     * @param AuthTokenData $itemData
+     *
+     * @throws SPException
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
+     */
+    public function updateRaw(AuthTokenData $itemData)
+    {
+        if ($this->authTokenRepository->update($itemData) === 0) {
+            throw new NoSuchItemException(__u('Token no encontrado'));
+        }
+    }
+
     /**
      * Devolver los datos de un token
      *
@@ -282,11 +296,13 @@ final class AuthTokenService extends Service
     }
 
     /**
-     * @return array
+     * @return AuthTokenData[]
+     * @throws \SP\Core\Exceptions\ConstraintException
+     * @throws \SP\Core\Exceptions\QueryException
      */
     public function getAllBasic()
     {
-        return $this->authTokenRepository->getAll();
+        return $this->authTokenRepository->getAll()->getDataAsArray();
     }
 
     /**
diff --git a/lib/SP/Services/CustomField/CustomFieldDefService.php b/lib/SP/Services/CustomField/CustomFieldDefService.php
index fc0a0f9b..c876e819 100644
--- a/lib/SP/Services/CustomField/CustomFieldDefService.php
+++ b/lib/SP/Services/CustomField/CustomFieldDefService.php
@@ -183,7 +183,7 @@ final class CustomFieldDefService extends Service
     /**
      * Get all items from the service's repository
      *
-     * @return array
+     * @return CustomFieldDefinitionData[]
      * @throws \SP\Core\Exceptions\ConstraintException
      * @throws \SP\Core\Exceptions\QueryException
      */
diff --git a/lib/SP/Services/Upgrade/UpgradeAppService.php b/lib/SP/Services/Upgrade/UpgradeAppService.php
index 39286f55..4034975d 100644
--- a/lib/SP/Services/Upgrade/UpgradeAppService.php
+++ b/lib/SP/Services/Upgrade/UpgradeAppService.php
@@ -37,7 +37,7 @@ use SP\Util\Util;
  */
 final class UpgradeAppService extends Service implements UpgradeInterface
 {
-    const UPGRADES = ['300.18010101'];
+    const UPGRADES = ['300.18010101', '300.18072901'];
 
     /**
      * @param $version
@@ -103,6 +103,12 @@ final class UpgradeAppService extends Service implements UpgradeInterface
                     $this->dic->get(UpgradePublicLink::class)
                         ->upgrade_300_18010101();
                     return true;
+                case '300.18072901':
+                    $this->dic->get(UpgradeCustomFieldDefinition::class)
+                        ->upgrade_300_18072901();
+                    $this->dic->get(UpgradeAuthToken::class)
+                        ->upgrade_300_18072901();
+                    return true;
             }
         } catch (\Exception $e) {
             processException($e);
diff --git a/lib/SP/Services/Upgrade/UpgradeAuthToken.php b/lib/SP/Services/Upgrade/UpgradeAuthToken.php
new file mode 100644
index 00000000..64fcef61
--- /dev/null
+++ b/lib/SP/Services/Upgrade/UpgradeAuthToken.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      https://syspass.org
+ * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Services\Upgrade;
+
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Events\Event;
+use SP\Core\Events\EventMessage;
+use SP\Services\AuthToken\AuthTokenService;
+use SP\Services\Service;
+
+
+/**
+ * Class UpgradeAuthToken
+ *
+ * @package SP\Services\Upgrade
+ */
+class UpgradeAuthToken extends Service
+{
+    /**
+     * @var AuthTokenService
+     */
+    private $authtokenService;
+
+    /**
+     * upgrade_300_18072901
+     *
+     * @throws \Exception
+     */
+    public function upgrade_300_18072901()
+    {
+        $this->eventDispatcher->notifyEvent('upgrade.authToken.start',
+            new Event($this, EventMessage::factory()
+                ->addDescription(__u('Actualización de autorizaciones API'))
+                ->addDescription(__FUNCTION__))
+        );
+
+        try {
+            $this->transactionAware(function () {
+                foreach ($this->authtokenService->getAllBasic() as $item) {
+
+                    $itemData = clone $item;
+                    $itemData->setActionId($this->actionMapper($item->getActionId()));
+
+                    $this->authtokenService->updateRaw($itemData);
+
+                    $this->eventDispatcher->notifyEvent('upgrade.authToken.process',
+                        new Event($this, EventMessage::factory()
+                            ->addDescription(__u('Autorización actualizada'))
+                            ->addDetail(__u('Autorización'), $item->getId()))
+                    );
+                }
+            });
+        } catch (\Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            throw $e;
+        }
+
+        $this->eventDispatcher->notifyEvent('upgrade.authToken.end',
+            new Event($this, EventMessage::factory()
+                ->addDescription(__u('Actualización de autorizaciones API'))
+                ->addDescription(__FUNCTION__))
+        );
+    }
+
+    /**
+     * @param int $moduleId
+     *
+     * @return int
+     */
+    private function actionMapper(int $moduleId)
+    {
+        switch ($moduleId) {
+            case 1:
+                return ActionsInterface::ACCOUNT_SEARCH;
+            case 100:
+                return ActionsInterface::ACCOUNT_VIEW;
+            case 104:
+                return ActionsInterface::ACCOUNT_VIEW_PASS;
+            case 103:
+                return ActionsInterface::ACCOUNT_DELETE;
+            case 101:
+                return ActionsInterface::ACCOUNT_CREATE;
+            case 615:
+                return ActionsInterface::CATEGORY_SEARCH;
+            case 610:
+                return ActionsInterface::CATEGORY_VIEW;
+            case 611:
+                return ActionsInterface::CATEGORY_CREATE;
+            case 612:
+                return ActionsInterface::CATEGORY_EDIT;
+            case 613:
+                return ActionsInterface::CATEGORY_DELETE;
+            case 625:
+                return ActionsInterface::CLIENT_SEARCH;
+            case 620:
+                return ActionsInterface::CLIENT_VIEW;
+            case 621:
+                return ActionsInterface::CLIENT_CREATE;
+            case 622:
+                return ActionsInterface::CLIENT_EDIT;
+            case 623:
+                return ActionsInterface::CLIENT_DELETE;
+            case 685:
+                return ActionsInterface::TAG_SEARCH;
+            case 681:
+                return ActionsInterface::TAG_VIEW;
+            case 680:
+                return ActionsInterface::TAG_CREATE;
+            case 682:
+                return ActionsInterface::TAG_EDIT;
+            case 683:
+                return ActionsInterface::TAG_DELETE;
+            case 1041:
+                return ActionsInterface::CONFIG_BACKUP_RUN;
+            case 1061:
+                return ActionsInterface::CONFIG_EXPORT_RUN;
+        }
+
+        return $moduleId;
+    }
+
+    protected function initialize()
+    {
+        $this->authtokenService = $this->dic->get(AuthTokenService::class);
+
+    }
+}
\ No newline at end of file
diff --git a/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php b/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
index 3f2eb0bc..b419be3f 100644
--- a/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
+++ b/lib/SP/Services/Upgrade/UpgradeCustomFieldDefinition.php
@@ -24,6 +24,7 @@
 
 namespace SP\Services\Upgrade;
 
+use SP\Core\Acl\ActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\CustomFieldDefDataOld;
@@ -48,6 +49,8 @@ final class UpgradeCustomFieldDefinition extends Service
 
     /**
      * upgrade_300_18010101
+     *
+     * @throws \Exception
      */
     public function upgrade_300_18010101()
     {
@@ -70,7 +73,7 @@ final class UpgradeCustomFieldDefinition extends Service
 
                     $itemData = new CustomFieldDefinitionData();
                     $itemData->setId($item->id);
-                    $itemData->setModuleId($item->moduleId);
+                    $itemData->setModuleId($this->moduleMapper((int)$item->moduleId));
                     $itemData->setName($data->getName());
                     $itemData->setHelp($data->getHelp());
                     $itemData->setRequired($data->isRequired());
@@ -90,6 +93,77 @@ final class UpgradeCustomFieldDefinition extends Service
             processException($e);
 
             $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            throw $e;
+        }
+
+        $this->eventDispatcher->notifyEvent('upgrade.customField.end',
+            new Event($this, EventMessage::factory()
+                ->addDescription(__u('Actualización de campos personalizados'))
+                ->addDescription(__FUNCTION__))
+        );
+    }
+
+    /**
+     * @param int $moduleId
+     *
+     * @return int
+     */
+    private function moduleMapper(int $moduleId)
+    {
+        switch ($moduleId) {
+            case 10:
+                return ActionsInterface::ACCOUNT;
+            case 61:
+                return ActionsInterface::CATEGORY;
+            case 62:
+                return ActionsInterface::CLIENT;
+            case 71:
+                return ActionsInterface::USER;
+            case 72:
+                return ActionsInterface::GROUP;
+        }
+
+        return $moduleId;
+    }
+
+    /**
+     * upgrade_300_18072901
+     *
+     * @throws \Exception
+     */
+    public function upgrade_300_18072901()
+    {
+        $this->eventDispatcher->notifyEvent('upgrade.customField.start',
+            new Event($this, EventMessage::factory()
+                ->addDescription(__u('Actualización de campos personalizados'))
+                ->addDescription(__FUNCTION__))
+        );
+
+        try {
+            $this->transactionAware(function () {
+                $customFieldDefService = $this->dic->get(CustomFieldDefService::class);
+
+                foreach ($customFieldDefService->getAllBasic() as $item) {
+
+                    $itemData = clone $item;
+                    $itemData->setModuleId($this->moduleMapper((int)$item->getModuleId()));
+
+                    $customFieldDefService->update($itemData);
+
+                    $this->eventDispatcher->notifyEvent('upgrade.customField.process',
+                        new Event($this, EventMessage::factory()
+                            ->addDescription(__u('Campo actualizado'))
+                            ->addDetail(__u('Campo'), $item->getName()))
+                    );
+                }
+            });
+        } catch (\Exception $e) {
+            processException($e);
+
+            $this->eventDispatcher->notifyEvent('exception', new Event($e));
+
+            throw $e;
         }
 
         $this->eventDispatcher->notifyEvent('upgrade.customField.end',
diff --git a/lib/SP/Storage/Database/Database.php b/lib/SP/Storage/Database/Database.php
index 143486c3..934bf90c 100644
--- a/lib/SP/Storage/Database/Database.php
+++ b/lib/SP/Storage/Database/Database.php
@@ -326,12 +326,18 @@ final class Database implements DatabaseInterface
     {
         $conn = $this->dbHandler->getConnection();
 
-        $result = !$conn->inTransaction() && $conn->beginTransaction();
+        if (!$conn->inTransaction()) {
+            $result = $conn->beginTransaction();
 
-        $this->eventDispatcher->notifyEvent('database.transaction.begin',
-            new Event($this, EventMessage::factory()->addData('result', $result)));
+            $this->eventDispatcher->notifyEvent('database.transaction.begin',
+                new Event($this, EventMessage::factory()->addData('result', $result)));
 
-        return $result;
+            return $result;
+        } else {
+            debugLog('beginTransaction: already in transaction');
+
+            return true;
+        }
     }
 
     /**
diff --git a/lib/SP/Storage/File/XmlFileStorageInterface.php b/lib/SP/Storage/File/XmlFileStorageInterface.php
index 464862e6..74bc00ac 100644
--- a/lib/SP/Storage/File/XmlFileStorageInterface.php
+++ b/lib/SP/Storage/File/XmlFileStorageInterface.php
@@ -51,4 +51,14 @@ interface XmlFileStorageInterface
      * @return mixed
      */
     public function getItems();
+
+    /**
+     * Returns the given path node value
+     *
+     * @param $path
+     *
+     * @return string
+     * @throws FileException
+     */
+    public function getPathValue($path);
 }
\ No newline at end of file
diff --git a/lib/SP/Storage/File/XmlHandler.php b/lib/SP/Storage/File/XmlHandler.php
index b1ac086d..bcc1d90c 100644
--- a/lib/SP/Storage/File/XmlHandler.php
+++ b/lib/SP/Storage/File/XmlHandler.php
@@ -289,4 +289,27 @@ final class XmlHandler implements XmlFileStorageInterface
 
         return $this;
     }
+
+    /**
+     * @param $path
+     *
+     * @return string
+     * @throws FileException
+     */
+    public function getPathValue($path)
+    {
+        $this->fileHandler->checkIsReadable();
+        $this->fileHandler->getFileSize(true);
+
+        $dom = new DOMDocument('1.0', 'utf-8');
+        $dom->load($this->fileHandler->getFile());
+
+        $query = (new \DOMXPath($dom))->query($path);
+
+        if ($query->length === 0) {
+            throw new RuntimeException(__u('El nodo XML no existe'));
+        }
+
+        return $query->item(0)->nodeValue;
+    }
 }
\ No newline at end of file
diff --git a/test/SP/Core/Acl/AclTest.php b/test/SP/Core/Acl/AclTest.php
new file mode 100644
index 00000000..f159b078
--- /dev/null
+++ b/test/SP/Core/Acl/AclTest.php
@@ -0,0 +1,877 @@
+<?php
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      https://syspass.org
+ * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Tests\SP\Core\Acl;
+
+use PHPUnit\Framework\TestCase;
+use SP\Core\Acl\Acl;
+use SP\Core\Acl\ActionsInterface;
+use SP\Core\Context\ContextInterface;
+use SP\DataModel\ProfileData;
+use SP\Services\User\UserLoginResponse;
+use function SP\Test\setupContext;
+
+/**
+ * Class AclTest
+ *
+ * @package SP\Tests\SP\Core\Acl
+ */
+class AclTest extends TestCase
+{
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+    /**
+     * @var Acl
+     */
+    private $acl;
+
+    /**
+     * @dataProvider actionsProvider
+     *
+     * @param $id
+     * @param $expected
+     */
+    public function testGetActionRoute($id, $expected)
+    {
+        $this->assertEquals($expected, Acl::getActionRoute($id));
+    }
+
+    /**
+     * testGetActionRouteUnknown
+     */
+    public function testGetActionRouteUnknown()
+    {
+        $this->assertEmpty(Acl::getActionRoute(10000));
+    }
+
+    /**
+     * @dataProvider actionsProvider
+     *
+     * @param $id
+     */
+    public function testCheckUserAccessAdminApp($id)
+    {
+        $this->assertTrue($this->acl->checkUserAccess($id));
+    }
+
+    /**
+     * testCheckUserAccessAccountView
+     */
+    public function testCheckUserAccessAccountView()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccView(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_VIEW]);
+    }
+
+    /**
+     * @param int[] $actionsId Masked action Id
+     */
+    private function checkUserAccess(array $actionsId)
+    {
+        $actionsMask = array_merge([
+            ActionsInterface::ACCOUNT_REQUEST,
+            ActionsInterface::NOTIFICATION,
+            ActionsInterface::NOTIFICATION_VIEW,
+            ActionsInterface::NOTIFICATION_SEARCH,
+            ActionsInterface::NOTIFICATION_CHECK,
+        ], $actionsId);
+
+        $actionsFalse = array_filter($this->actionsProvider(), function ($action) use ($actionsMask) {
+            return !in_array($action[0], $actionsMask);
+        });
+
+        $actionsTrue = array_filter($this->actionsProvider(), function ($action) use ($actionsMask) {
+            return in_array($action[0], $actionsMask);
+        });
+
+        foreach ($actionsFalse as $action) {
+            $this->assertFalse($this->acl->checkUserAccess($action[0]));
+        }
+
+        foreach ($actionsTrue as $action) {
+            $this->assertTrue($this->acl->checkUserAccess($action[0]));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function actionsProvider()
+    {
+        return [
+            [2, 'account/search'],
+            [1, 'account/index'],
+            [20, 'account/listFile'],
+            [12, 'account/requestAccess'],
+            [30, 'favorite/index'],
+            [1201, 'wiki/index'],
+            [5001, 'itemManager/index'],
+            [101, 'category/index'],
+            [301, 'client/index'],
+            [1001, 'authToken/index'],
+            [401, 'customField/index'],
+            [501, 'publicLink/index'],
+            [601, 'file/index'],
+            [1301, 'accountManager/index'],
+            [201, 'tag/index'],
+            [1101, 'plugin/index'],
+            [5002, 'accessManager/index'],
+            [701, 'user/index'],
+            [801, 'group/index'],
+            [901, 'profile/index'],
+            [1701, 'eventlog/index'],
+            [1702, 'eventlog/search'],
+            [1703, 'eventlog/clear'],
+            [3, 'account/view'],
+            [4, 'account/create'],
+            [5, 'account/edit'],
+            [6, 'account/delete'],
+            [7, 'account/viewPass'],
+            [8, 'account/editPass'],
+            [9, 'account/restore'],
+            [10, 'account/copy'],
+            [11, 'account/copyPass'],
+            [21, 'accountFile/view'],
+            [22, 'accountFile/upload'],
+            [23, 'accountFile/download'],
+            [24, 'accountFile/delete'],
+            [25, 'accountFile/search'],
+            [26, 'accountFile/list'],
+            [31, 'favorite/view'],
+            [32, 'accountFavorite/mark'],
+            [33, 'accountFavorite/unmark'],
+            [40, 'account/viewHistory'],
+            [41, 'account/viewPassHistory'],
+            [42, 'account/copyPassHistory'],
+            [1203, 'wiki/view'],
+            [1204, 'wiki/create'],
+            [1205, 'wiki/edit'],
+            [1206, 'wiki/delete'],
+            [103, 'category/view'],
+            [104, 'category/create'],
+            [105, 'category/edit'],
+            [106, 'category/delete'],
+            [102, 'category/search'],
+            [303, 'client/view'],
+            [304, 'client/create'],
+            [305, 'client/edit'],
+            [306, 'client/delete'],
+            [302, 'client/search'],
+            [1004, 'authToken/create'],
+            [1003, 'authToken/view'],
+            [1005, 'authToken/edit'],
+            [1006, 'authToken/delete'],
+            [1002, 'authToken/search'],
+            [404, 'customField/create'],
+            [403, 'customField/view'],
+            [405, 'customField/edit'],
+            [406, 'customField/delete'],
+            [402, 'customField/search'],
+            [504, 'publicLink/create'],
+            [503, 'publicLink/view'],
+            [506, 'publicLink/delete'],
+            [507, 'publicLink/refresh'],
+            [502, 'publicLink/search'],
+            [603, 'file/view'],
+            [605, 'file/download'],
+            [606, 'file/delete'],
+            [604, 'file/upload'],
+            [602, 'file/search'],
+            [1303, 'accountManager/view'],
+            [1304, 'accountManager/delete'],
+            [1302, 'accountManager/search'],
+            [204, 'tag/create'],
+            [203, 'tag/view'],
+            [205, 'tag/edit'],
+            [206, 'tag/delete'],
+            [202, 'tag/search'],
+            [1104, 'plugin/create'],
+            [1103, 'plugin/view'],
+            [1102, 'plugin/search'],
+            [1105, 'plugin/enable'],
+            [1106, 'plugin/disable'],
+            [1107, 'plugin/reset'],
+            [703, 'user/view'],
+            [704, 'user/create'],
+            [705, 'user/edit'],
+            [706, 'user/delete'],
+            [707, 'user/editPass'],
+            [702, 'user/search'],
+            [803, 'userGroup/view'],
+            [804, 'userGroup/create'],
+            [805, 'userGroup/edit'],
+            [806, 'userGroup/delete'],
+            [802, 'userGroup/search'],
+            [903, 'userProfile/view'],
+            [904, 'userProfile/create'],
+            [905, 'userProfile/edit'],
+            [906, 'userProfile/delete'],
+            [902, 'userProfile/search'],
+            [5010, 'userSettingsManager/index'],
+            [5011, 'userSettings/general'],
+            [1401, 'notification/index'],
+            [1501, 'configManager/index'],
+            [1502, 'configManager/general'],
+            [1510, 'account/config'],
+            [1520, 'wiki/config'],
+            [1530, 'encryption/config'],
+            [1531, 'encryption/updateHash'],
+            [1532, 'encryption/createTempPass'],
+            [1540, 'backup/config'],
+            [1541, 'backup/backup'],
+            [1550, 'import/config'],
+            [1551, 'import/csv'],
+            [1552, 'import/xml'],
+            [1560, 'export/config'],
+            [1561, 'export/export'],
+            [1570, 'mail/config'],
+            [1580, 'ldap/config'],
+            [1581, 'ldap/sync'],
+            [1311, 'accountHistoryManager/index'],
+            [1314, 'accountHistoryManager/delete'],
+            [1312, 'accountHistoryManager/search'],
+            [1315, 'accountManager/restore'],
+            [1403, 'notification/view'],
+            [1404, 'notification/create'],
+            [1405, 'notification/edit'],
+            [1406, 'notification/delete'],
+            [1407, 'notification/check'],
+            [1402, 'notification/search']
+        ];
+    }
+
+    /**
+     * testCheckUserAccessAdminAcc
+     */
+    public function testCheckUserAccessAdminAcc()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+        $userData->setIsAdminAcc(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile(new ProfileData());
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCOUNT_VIEW,
+            ActionsInterface::ACCOUNT_VIEW_PASS,
+            ActionsInterface::ACCOUNT_HISTORY_VIEW,
+            ActionsInterface::ACCOUNT_EDIT,
+            ActionsInterface::ACCOUNT_EDIT_PASS,
+            ActionsInterface::ACCOUNT_CREATE,
+            ActionsInterface::ACCOUNT_COPY,
+            ActionsInterface::ACCOUNT_DELETE,
+            ActionsInterface::ACCOUNT_FILE,
+            ActionsInterface::ACCOUNTMGR,
+            ActionsInterface::ACCOUNTMGR_SEARCH,
+            ActionsInterface::ACCOUNTMGR_HISTORY,
+            ActionsInterface::ACCOUNTMGR_HISTORY_SEARCH,
+            ActionsInterface::ITEMS_MANAGE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessAccountEdit
+     */
+    public function testCheckUserAccessAccountEdit()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccEdit(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_EDIT, ActionsInterface::ACCOUNT_VIEW]);
+    }
+
+    /**
+     * testCheckUserAccessAccountEditPass
+     */
+    public function testCheckUserAccessAccountEditPass()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccEditPass(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_EDIT_PASS]);
+    }
+
+    /**
+     * testCheckUserAccessAccountCreate
+     */
+    public function testCheckUserAccessAccountCreate()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccAdd(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_CREATE]);
+    }
+
+    /**
+     * testCheckUserAccessAccountCopy
+     */
+    public function testCheckUserAccessAccountCopy()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccAdd(true);
+        $userProfile->setAccView(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCOUNT_COPY,
+            ActionsInterface::ACCOUNT_VIEW,
+            ActionsInterface::ACCOUNT_CREATE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessAccountDelete
+     */
+    public function testCheckUserAccessAccountDelete()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccDelete(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_DELETE]);
+    }
+
+    /**
+     * testCheckUserAccessAccountFile
+     */
+    public function testCheckUserAccessAccountFile()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccFiles(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_FILE]);
+    }
+
+    /**
+     * testCheckUserAccessConfigGeneral
+     */
+    public function testCheckUserAccessConfigGeneral()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setConfigGeneral(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::CONFIG,
+            ActionsInterface::CONFIG_GENERAL,
+            ActionsInterface::PLUGIN,
+            ActionsInterface::CONFIG_ACCOUNT,
+            ActionsInterface::CONFIG_WIKI,
+            ActionsInterface::CONFIG_LDAP,
+            ActionsInterface::CONFIG_MAIL
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessConfigImport
+     */
+    public function testCheckUserAccessConfigImport()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setConfigImport(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::CONFIG,
+            ActionsInterface::CONFIG_IMPORT
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessCategory
+     */
+    public function testCheckUserAccessCategory()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmCategories(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::CATEGORY,
+            ActionsInterface::CATEGORY_SEARCH,
+            ActionsInterface::CATEGORY_VIEW,
+            ActionsInterface::CATEGORY_CREATE,
+            ActionsInterface::CATEGORY_EDIT,
+            ActionsInterface::CATEGORY_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessClient
+     */
+    public function testCheckUserAccessClient()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmCustomers(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::CLIENT,
+            ActionsInterface::CLIENT_SEARCH,
+            ActionsInterface::CLIENT_VIEW,
+            ActionsInterface::CLIENT_CREATE,
+            ActionsInterface::CLIENT_EDIT,
+            ActionsInterface::CLIENT_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessCustomField
+     */
+    public function testCheckUserAccessCustomField()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmCustomFields(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::CUSTOMFIELD,
+            ActionsInterface::CUSTOMFIELD_SEARCH,
+            ActionsInterface::CUSTOMFIELD_VIEW,
+            ActionsInterface::CUSTOMFIELD_CREATE,
+            ActionsInterface::CUSTOMFIELD_EDIT,
+            ActionsInterface::CUSTOMFIELD_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessPublicLink
+     */
+    public function testCheckUserAccessPublicLink()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmPublicLinks(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::PUBLICLINK,
+            ActionsInterface::PUBLICLINK_SEARCH,
+            ActionsInterface::PUBLICLINK_CREATE,
+            ActionsInterface::PUBLICLINK_REFRESH,
+            ActionsInterface::PUBLICLINK_VIEW,
+            ActionsInterface::PUBLICLINK_EDIT,
+            ActionsInterface::PUBLICLINK_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessPublicLinkCreate
+     */
+    public function testCheckUserAccessPublicLinkCreate()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccPublicLinks(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::PUBLICLINK_CREATE,
+            ActionsInterface::PUBLICLINK_REFRESH
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessAccount
+     */
+    public function testCheckUserAccessAccount()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmAccounts(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::ACCOUNTMGR,
+            ActionsInterface::ACCOUNTMGR_SEARCH,
+            ActionsInterface::ACCOUNTMGR_HISTORY,
+            ActionsInterface::ACCOUNTMGR_HISTORY_SEARCH
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessFile
+     */
+    public function testCheckUserAccessFile()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmFiles(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::FILE,
+            ActionsInterface::FILE_SEARCH,
+            ActionsInterface::FILE_DELETE,
+            ActionsInterface::FILE_VIEW,
+            ActionsInterface::FILE_DOWNLOAD
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessTag
+     */
+    public function testCheckUserAccessTag()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmTags(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ITEMS_MANAGE,
+            ActionsInterface::TAG,
+            ActionsInterface::TAG_SEARCH,
+            ActionsInterface::TAG_VIEW,
+            ActionsInterface::TAG_CREATE,
+            ActionsInterface::TAG_EDIT,
+            ActionsInterface::TAG_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessConfigCrypt
+     */
+    public function testCheckUserAccessConfigCrypt()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setConfigEncryption(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::CONFIG,
+            ActionsInterface::CONFIG_CRYPT
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessConfigBackup
+     */
+    public function testCheckUserAccessConfigBackup()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setConfigBackup(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::CONFIG,
+            ActionsInterface::CONFIG_BACKUP
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessUser
+     */
+    public function testCheckUserAccessUser()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmUsers(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCESS_MANAGE,
+            ActionsInterface::USER,
+            ActionsInterface::USER_SEARCH,
+            ActionsInterface::USER_VIEW,
+            ActionsInterface::USER_CREATE,
+            ActionsInterface::USER_EDIT,
+            ActionsInterface::USER_DELETE,
+            ActionsInterface::USER_EDIT_PASS
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessUserGroup
+     */
+    public function testCheckUserAccessUserGroup()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmGroups(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCESS_MANAGE,
+            ActionsInterface::GROUP,
+            ActionsInterface::GROUP_SEARCH,
+            ActionsInterface::GROUP_VIEW,
+            ActionsInterface::GROUP_CREATE,
+            ActionsInterface::GROUP_EDIT,
+            ActionsInterface::GROUP_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessUserProfile
+     */
+    public function testCheckUserAccessUserProfile()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmProfiles(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCESS_MANAGE,
+            ActionsInterface::PROFILE,
+            ActionsInterface::PROFILE_SEARCH,
+            ActionsInterface::PROFILE_VIEW,
+            ActionsInterface::PROFILE_CREATE,
+            ActionsInterface::PROFILE_EDIT,
+            ActionsInterface::PROFILE_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessAuthToken
+     */
+    public function testCheckUserAccessAuthToken()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setMgmApiTokens(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::ACCESS_MANAGE,
+            ActionsInterface::AUTHTOKEN,
+            ActionsInterface::AUTHTOKEN_SEARCH,
+            ActionsInterface::AUTHTOKEN_VIEW,
+            ActionsInterface::AUTHTOKEN_CREATE,
+            ActionsInterface::AUTHTOKEN_EDIT,
+            ActionsInterface::AUTHTOKEN_DELETE
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessEventlog
+     */
+    public function testCheckUserAccessEventlog()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setEvl(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([
+            ActionsInterface::EVENTLOG,
+            ActionsInterface::EVENTLOG_SEARCH,
+            ActionsInterface::EVENTLOG_CLEAR
+        ]);
+    }
+
+    /**
+     * testCheckUserAccessAccountViewPass
+     */
+    public function testCheckUserAccessAccountViewPass()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccViewPass(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_VIEW_PASS, ActionsInterface::CUSTOMFIELD_VIEW_PASS]);
+    }
+
+    /**
+     * testCheckUserAccessAccountHistoryView
+     */
+    public function testCheckUserAccessAccountHistoryView()
+    {
+        $userData = new UserLoginResponse();
+        $userData->setId(2);
+
+        $userProfile = new ProfileData();
+        $userProfile->setAccViewHistory(true);
+
+        $this->context->setUserData($userData);
+        $this->context->setUserProfile($userProfile);
+
+        $this->assertTrue($this->acl->checkUserAccess(ActionsInterface::ACCOUNT_HISTORY_VIEW));
+
+        $this->checkUserAccess([ActionsInterface::ACCOUNT_HISTORY_VIEW]);
+    }
+
+    /**
+     * @dataProvider actionsProvider
+     *
+     * @param $id
+     */
+    public function testGetActionInfo($id)
+    {
+        $this->assertNotEmpty(Acl::getActionInfo($id));
+    }
+
+    /**
+     * testGetActionInfoUnknown
+     */
+    public function testGetActionInfoUnknown()
+    {
+        $this->assertEmpty(Acl::getActionInfo(10000));
+    }
+
+    /**
+     * @throws \DI\DependencyException
+     * @throws \DI\NotFoundException
+     * @throws \SP\Core\Context\ContextException
+     */
+    protected function setUp()
+    {
+        $dic = setupContext();
+
+        $this->acl = $dic->get(Acl::class);
+        $this->context = $dic->get(ContextInterface::class);
+    }
+}
diff --git a/test/res/config/actions.xml b/test/res/config/actions.xml
index 26205c98..1ba6d586 100644
--- a/test/res/config/actions.xml
+++ b/test/res/config/actions.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE actions>
 <actions>
     <action multiple="1">
-        <id>1</id>
+        <id>2</id>
         <name>ACCOUNT_SEARCH</name>
         <text>Buscar Cuentas</text>
         <route>account/search</route>
     </action>
     <action multiple="1">
-        <id>10</id>
+        <id>1</id>
         <name>ACCOUNT</name>
         <text>Cuentas</text>
         <route>account/index</route>
     </action>
     <action multiple="1">
-        <id>11</id>
+        <id>20</id>
         <name>ACCOUNT_FILE</name>
         <text>Archivos</text>
         <route>account/listFile</route>
@@ -26,805 +26,805 @@
         <route>account/requestAccess</route>
     </action>
     <action multiple="1">
-        <id>13</id>
+        <id>30</id>
         <name>ACCOUNT_FAVORITE</name>
         <text>Favoritos</text>
         <route>favorite/index</route>
     </action>
     <action multiple="1">
-        <id>20</id>
+        <id>1201</id>
         <name>WIKI</name>
         <text>Wiki</text>
         <route>wiki/index</route>
     </action>
     <action multiple="1">
-        <id>60</id>
+        <id>5001</id>
         <name>ITEMS_MANAGE</name>
         <text>Elementos y Personalización</text>
         <route>itemManager/index</route>
     </action>
     <action multiple="1">
-        <id>61</id>
+        <id>101</id>
         <name>CATEGORY</name>
         <text>Gestión Categorías</text>
         <route>category/index</route>
     </action>
     <action multiple="1">
-        <id>62</id>
+        <id>301</id>
         <name>CLIENT</name>
         <text>Gestión Clientes</text>
         <route>client/index</route>
     </action>
     <action multiple="1">
-        <id>63</id>
+        <id>1001</id>
         <name>AUTHTOKEN</name>
         <text>Gestión Autorizaciones API</text>
         <route>authToken/index</route>
     </action>
     <action multiple="1">
-        <id>64</id>
+        <id>401</id>
         <name>CUSTOMFIELD</name>
         <text>Gestión Campos Personalizados</text>
         <route>customField/index</route>
     </action>
     <action multiple="1">
-        <id>65</id>
+        <id>501</id>
         <name>PUBLICLINK</name>
         <text>Enlaces Públicos</text>
         <route>publicLink/index</route>
     </action>
     <action multiple="1">
-        <id>66</id>
+        <id>601</id>
         <name>FILE</name>
         <text>Gestión de Archivos</text>
         <route>file/index</route>
     </action>
     <action multiple="1">
-        <id>67</id>
+        <id>1301</id>
         <name>ACCOUNTMGR</name>
         <text>Gestión de Cuentas</text>
         <route>accountManager/index</route>
     </action>
     <action multiple="1">
-        <id>68</id>
+        <id>201</id>
         <name>TAG</name>
         <text>Gestión de Etiquetas</text>
         <route>tag/index</route>
     </action>
     <action multiple="1">
-        <id>69</id>
+        <id>1101</id>
         <name>PLUGIN</name>
         <text>Gestión Plugins</text>
         <route>plugin/index</route>
     </action>
     <action multiple="1">
-        <id>70</id>
+        <id>5002</id>
         <name>ACCESS_MANAGE</name>
         <text>Usuarios y Accesos</text>
         <route>accessManager/index</route>
     </action>
     <action multiple="1">
-        <id>71</id>
+        <id>701</id>
         <name>USER</name>
         <text>Gestión Usuarios</text>
         <route>user/index</route>
     </action>
     <action multiple="1">
-        <id>72</id>
+        <id>801</id>
         <name>GROUP</name>
         <text>Gestión Grupos</text>
         <route>group/index</route>
     </action>
     <action multiple="1">
-        <id>73</id>
+        <id>901</id>
         <name>PROFILE</name>
         <text>Gestión Perfiles</text>
         <route>profile/index</route>
     </action>
     <action multiple="1">
-        <id>90</id>
+        <id>1701</id>
         <name>EVENTLOG</name>
         <text>Registro de Eventos</text>
         <route>eventlog/index</route>
     </action>
     <action multiple="1">
-        <id>905</id>
+        <id>1702</id>
         <name>EVENTLOG_SEARCH</name>
         <text>Buscar Eventos</text>
         <route>eventlog/search</route>
     </action>
     <action multiple="1">
-        <id>906</id>
+        <id>1703</id>
         <name>EVENTLOG_CLEAR</name>
         <text>Limpiar Eventos</text>
         <route>eventlog/clear</route>
     </action>
     <action multiple="1">
-        <id>100</id>
+        <id>3</id>
         <name>ACCOUNT_VIEW</name>
         <text>Ver Cuenta</text>
         <route>account/view</route>
     </action>
     <action multiple="1">
-        <id>101</id>
+        <id>4</id>
         <name>ACCOUNT_CREATE</name>
         <text>Nueva Cuenta</text>
         <route>account/create</route>
     </action>
     <action multiple="1">
-        <id>102</id>
+        <id>5</id>
         <name>ACCOUNT_EDIT</name>
         <text>Editar Cuenta</text>
         <route>account/edit</route>
     </action>
     <action multiple="1">
-        <id>103</id>
+        <id>6</id>
         <name>ACCOUNT_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>account/delete</route>
     </action>
     <action multiple="1">
-        <id>104</id>
+        <id>7</id>
         <name>ACCOUNT_VIEW_PASS</name>
         <text>Ver Clave</text>
         <route>account/viewPass</route>
     </action>
     <action multiple="1">
-        <id>106</id>
+        <id>8</id>
         <name>ACCOUNT_EDIT_PASS</name>
         <text>Editar Clave de Cuenta</text>
         <route>account/editPass</route>
     </action>
     <action multiple="1">
-        <id>107</id>
+        <id>9</id>
         <name>ACCOUNT_EDIT_RESTORE</name>
         <text>Restaurar Cuenta</text>
         <route>account/restore</route>
     </action>
     <action multiple="1">
-        <id>108</id>
+        <id>10</id>
         <name>ACCOUNT_COPY</name>
         <text>Copiar Cuenta</text>
         <route>account/copy</route>
     </action>
     <action multiple="1">
-        <id>109</id>
+        <id>11</id>
         <name>ACCOUNT_COPY_PASS</name>
         <text>Copiar Clave</text>
         <route>account/copyPass</route>
     </action>
     <action multiple="1">
-        <id>111</id>
+        <id>21</id>
         <name>ACCOUNT_FILE_VIEW</name>
         <text>Ver Archivo</text>
         <route>accountFile/view</route>
     </action>
     <action multiple="1">
-        <id>112</id>
+        <id>22</id>
         <name>ACCOUNT_FILE_UPLOAD</name>
         <text>Subir Archivo</text>
         <route>accountFile/upload</route>
     </action>
     <action multiple="1">
-        <id>113</id>
+        <id>23</id>
         <name>ACCOUNT_FILE_DOWNLOAD</name>
         <text>Descargar Archivo</text>
         <route>accountFile/download</route>
     </action>
     <action multiple="1">
-        <id>114</id>
+        <id>24</id>
         <name>ACCOUNT_FILE_DELETE</name>
         <text>Eliminar Archivo</text>
         <route>accountFile/delete</route>
     </action>
     <action multiple="1">
-        <id>115</id>
+        <id>25</id>
         <name>ACCOUNT_FILE_SEARCH</name>
         <text>Buscar Archivos</text>
         <route>accountFile/search</route>
     </action>
     <action multiple="1">
-        <id>116</id>
+        <id>26</id>
         <name>ACCOUNT_FILE_LIST</name>
         <text>Listar Archivos</text>
         <route>accountFile/list</route>
     </action>
     <action multiple="1">
-        <id>130</id>
+        <id>31</id>
         <name>ACCOUNT_FAVORITE_VIEW</name>
         <text>Ver Favoritos</text>
         <route>favorite/view</route>
     </action>
     <action multiple="1">
-        <id>131</id>
+        <id>32</id>
         <name>ACCOUNT_FAVORITE_ADD</name>
         <text>Añadir Favorito</text>
         <route>accountFavorite/mark</route>
     </action>
     <action multiple="1">
-        <id>133</id>
+        <id>33</id>
         <name>ACCOUNT_FAVORITE_DELETE</name>
         <text>Eliminar Favorito</text>
         <route>accountFavorite/unmark</route>
     </action>
     <action multiple="1">
-        <id>140</id>
+        <id>40</id>
         <name>ACCOUNT_HISTORY_VIEW</name>
         <text>Ver Historial</text>
         <route>account/viewHistory</route>
     </action>
     <action multiple="1">
-        <id>141</id>
+        <id>41</id>
         <name>ACCOUNT_HISTORY_VIEW_PASS</name>
         <text>Ver Clave</text>
         <route>account/viewPassHistory</route>
     </action>
     <action multiple="1">
-        <id>142</id>
+        <id>42</id>
         <name>ACCOUNT_HISTORY_COPY_PASS</name>
         <text>Copiar Clave</text>
         <route>account/copyPassHistory</route>
     </action>
     <action multiple="1">
-        <id>200</id>
+        <id>1203</id>
         <name>WIKI_VIEW</name>
         <text>Ver Wiki</text>
         <route>wiki/view</route>
     </action>
     <action multiple="1">
-        <id>201</id>
-        <name>WIKI_NEW</name>
+        <id>1204</id>
+        <name>WIKI_CREATE</name>
         <text>Añadir Wiki</text>
         <route>wiki/create</route>
     </action>
     <action multiple="1">
-        <id>202</id>
+        <id>1205</id>
         <name>WIKI_EDIT</name>
         <text>Editar Wiki</text>
         <route>wiki/edit</route>
     </action>
     <action multiple="1">
-        <id>203</id>
+        <id>1206</id>
         <name>WIKI_DELETE</name>
         <text>Eliminar Wiki</text>
         <route>wiki/delete</route>
     </action>
     <action multiple="1">
-        <id>610</id>
+        <id>103</id>
         <name>CATEGORY_VIEW</name>
         <text>Ver Categoría</text>
         <route>category/view</route>
     </action>
     <action multiple="1">
-        <id>611</id>
+        <id>104</id>
         <name>CATEGORY_CREATE</name>
         <text>Nueva Categoría</text>
         <route>category/create</route>
     </action>
     <action multiple="1">
-        <id>612</id>
+        <id>105</id>
         <name>CATEGORY_EDIT</name>
         <text>Editar Categoría</text>
         <route>category/edit</route>
     </action>
     <action multiple="1">
-        <id>613</id>
+        <id>106</id>
         <name>CATEGORY_DELETE</name>
         <text>Eliminar Categoría</text>
         <route>category/delete</route>
     </action>
     <action multiple="1">
-        <id>615</id>
+        <id>102</id>
         <name>CATEGORY_SEARCH</name>
         <text>Buscar Categoría</text>
         <route>category/search</route>
     </action>
     <action multiple="1">
-        <id>620</id>
+        <id>303</id>
         <name>CLIENT_VIEW</name>
         <text>Ver Cliente</text>
         <route>client/view</route>
     </action>
     <action multiple="1">
-        <id>621</id>
+        <id>304</id>
         <name>CLIENT_CREATE</name>
         <text>Nuevo CLiente</text>
         <route>client/create</route>
     </action>
     <action multiple="1">
-        <id>622</id>
+        <id>305</id>
         <name>CLIENT_EDIT</name>
         <text>Editar Cliente</text>
         <route>client/edit</route>
     </action>
     <action multiple="1">
-        <id>623</id>
+        <id>306</id>
         <name>CLIENT_DELETE</name>
         <text>Eliminar Cliente</text>
         <route>client/delete</route>
     </action>
     <action multiple="1">
-        <id>625</id>
+        <id>302</id>
         <name>CLIENT_SEARCH</name>
         <text>Buscar Cliente</text>
         <route>client/search</route>
     </action>
     <action multiple="1">
-        <id>630</id>
+        <id>1004</id>
         <name>AUTHTOKEN_CREATE</name>
         <text>Nuevo Token API</text>
         <route>authToken/create</route>
     </action>
     <action multiple="1">
-        <id>631</id>
+        <id>1003</id>
         <name>AUTHTOKEN_VIEW</name>
         <text>Ver Token API</text>
         <route>authToken/view</route>
     </action>
     <action multiple="1">
-        <id>632</id>
+        <id>1005</id>
         <name>AUTHTOKEN_EDIT</name>
         <text>Editar Token API</text>
         <route>authToken/edit</route>
     </action>
     <action multiple="1">
-        <id>633</id>
+        <id>1006</id>
         <name>AUTHTOKEN_DELETE</name>
         <text>Eliminar Token API</text>
         <route>authToken/delete</route>
     </action>
     <action multiple="1">
-        <id>635</id>
+        <id>1002</id>
         <name>AUTHTOKEN_SEARCH</name>
         <text>Buscar Token API</text>
         <route>authToken/search</route>
     </action>
     <action multiple="1">
-        <id>640</id>
+        <id>404</id>
         <name>CUSTOMFIELD_CREATE</name>
         <text>Nuevo Campo Personalizado</text>
         <route>customField/create</route>
     </action>
     <action multiple="1">
-        <id>641</id>
+        <id>403</id>
         <name>CUSTOMFIELD_VIEW</name>
         <text>Ver Campo Personalizado</text>
         <route>customField/view</route>
     </action>
     <action multiple="1">
-        <id>642</id>
+        <id>405</id>
         <name>CUSTOMFIELD_EDIT</name>
         <text>Editar Campo Personalizado</text>
         <route>customField/edit</route>
     </action>
     <action multiple="1">
-        <id>643</id>
+        <id>406</id>
         <name>CUSTOMFIELD_DELETE</name>
         <text>Eliminar Campo Personalizado</text>
         <route>customField/delete</route>
     </action>
     <action multiple="1">
-        <id>645</id>
+        <id>402</id>
         <name>CUSTOMFIELD_SEARCH</name>
         <text>Buscar Campo Personalizado</text>
         <route>customField/search</route>
     </action>
     <action multiple="1">
-        <id>650</id>
+        <id>504</id>
         <name>PUBLICLINK_CREATE</name>
         <text>Crear Enlace Público</text>
         <route>publicLink/create</route>
     </action>
     <action multiple="1">
-        <id>651</id>
+        <id>503</id>
         <name>PUBLICLINK_VIEW</name>
         <text>Ver Enlace Público</text>
         <route>publicLink/view</route>
     </action>
     <action multiple="1">
-        <id>653</id>
+        <id>506</id>
         <name>PUBLICLINK_DELETE</name>
         <text>Eliminar Enlace Público</text>
         <route>publicLink/delete</route>
     </action>
     <action multiple="1">
-        <id>654</id>
+        <id>507</id>
         <name>PUBLICLINK_REFRESH</name>
         <text>Actualizar Enlace Público</text>
         <route>publicLink/refresh</route>
     </action>
     <action multiple="1">
-        <id>655</id>
+        <id>502</id>
         <name>PUBLICLINK_SEARCH</name>
         <text>Buscar Enlace Público</text>
         <route>publicLink/search</route>
     </action>
     <action multiple="1">
-        <id>661</id>
+        <id>603</id>
         <name>FILE_VIEW</name>
         <text>Ver Archivo</text>
         <route>file/view</route>
     </action>
     <action multiple="1">
-        <id>662</id>
+        <id>605</id>
         <name>FILE_DOWNLOAD</name>
         <text>Descargar Archivo</text>
         <route>file/download</route>
     </action>
     <action multiple="1">
-        <id>663</id>
+        <id>606</id>
         <name>FILE_DELETE</name>
         <text>Eliminar Archivo</text>
         <route>file/delete</route>
     </action>
     <action multiple="1">
-        <id>664</id>
+        <id>604</id>
         <name>FILE_UPLOAD</name>
         <text>Subir Archivo</text>
         <route>file/upload</route>
     </action>
     <action multiple="1">
-        <id>665</id>
+        <id>602</id>
         <name>FILE_SEARCH</name>
         <text>Buscar Archivo</text>
         <route>file/search</route>
     </action>
     <action multiple="1">
-        <id>671</id>
+        <id>1303</id>
         <name>ACCOUNTMGR_VIEW</name>
         <text>Ver Cuenta</text>
         <route>accountManager/view</route>
     </action>
     <action multiple="1">
-        <id>673</id>
+        <id>1304</id>
         <name>ACCOUNTMGR_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>accountManager/delete</route>
     </action>
     <action multiple="1">
-        <id>675</id>
+        <id>1302</id>
         <name>ACCOUNTMGR_SEARCH</name>
         <text>Buscar Cuenta</text>
         <route>accountManager/search</route>
     </action>
     <action multiple="1">
-        <id>680</id>
+        <id>204</id>
         <name>TAG_CREATE</name>
         <text>Nueva Etiqueta</text>
         <route>tag/create</route>
     </action>
     <action multiple="1">
-        <id>681</id>
+        <id>203</id>
         <name>TAG_VIEW</name>
         <text>Ver Etiqueta</text>
         <route>tag/view</route>
     </action>
     <action multiple="1">
-        <id>682</id>
+        <id>205</id>
         <name>TAG_EDIT</name>
         <text>Editar Etiqueta</text>
         <route>tag/edit</route>
     </action>
     <action multiple="1">
-        <id>683</id>
+        <id>206</id>
         <name>TAG_DELETE</name>
         <text>Eliminar Etiqueta</text>
         <route>tag/delete</route>
     </action>
     <action multiple="1">
-        <id>685</id>
+        <id>202</id>
         <name>TAG_SEARCH</name>
         <text>Buscar Etiqueta</text>
         <route>tag/search</route>
     </action>
     <action multiple="1">
-        <id>690</id>
-        <name>PLUGIN_NEW</name>
+        <id>1104</id>
+        <name>PLUGIN_CREATE</name>
         <text>Nuevo Plugin</text>
         <route>plugin/create</route>
     </action>
     <action multiple="1">
-        <id>691</id>
+        <id>1103</id>
         <name>PLUGIN_VIEW</name>
         <text>Ver Plugin</text>
         <route>plugin/view</route>
     </action>
     <action multiple="1">
-        <id>695</id>
+        <id>1102</id>
         <name>PLUGIN_SEARCH</name>
         <text>Buscar Plugin</text>
         <route>plugin/search</route>
     </action>
     <action multiple="1">
-        <id>696</id>
+        <id>1105</id>
         <name>PLUGIN_ENABLE</name>
         <text>Habilitar Plugin</text>
         <route>plugin/enable</route>
     </action>
     <action multiple="1">
-        <id>697</id>
+        <id>1106</id>
         <name>PLUGIN_DISABLE</name>
         <text>Deshabilitar Plugin</text>
         <route>plugin/disable</route>
     </action>
     <action multiple="1">
-        <id>698</id>
+        <id>1107</id>
         <name>PLUGIN_RESET</name>
         <text>Restablecer Plugin</text>
         <route>plugin/reset</route>
     </action>
     <action multiple="1">
-        <id>710</id>
+        <id>703</id>
         <name>USER_VIEW</name>
         <text>Ver Usuario</text>
         <route>user/view</route>
     </action>
     <action multiple="1">
-        <id>711</id>
+        <id>704</id>
         <name>USER_CREATE</name>
         <text>Nuevo Usuario</text>
         <route>user/create</route>
     </action>
     <action multiple="1">
-        <id>712</id>
+        <id>705</id>
         <name>USER_EDIT</name>
         <text>Editar Usuario</text>
         <route>user/edit</route>
     </action>
     <action multiple="1">
-        <id>713</id>
+        <id>706</id>
         <name>USER_DELETE</name>
         <text>Eliminar Usuario</text>
         <route>user/delete</route>
     </action>
     <action multiple="1">
-        <id>714</id>
+        <id>707</id>
         <name>USER_EDIT_PASS</name>
         <text>Editar Clave Usuario</text>
         <route>user/editPass</route>
     </action>
     <action multiple="1">
-        <id>715</id>
+        <id>702</id>
         <name>USER_SEARCH</name>
         <text>Buscar Usuario</text>
         <route>user/search</route>
     </action>
     <action multiple="1">
-        <id>720</id>
+        <id>803</id>
         <name>GROUP_VIEW</name>
         <text>Ver Grupo</text>
         <route>userGroup/view</route>
     </action>
     <action multiple="1">
-        <id>721</id>
+        <id>804</id>
         <name>GROUP_CREATE</name>
         <text>Nuevo Grupo</text>
         <route>userGroup/create</route>
     </action>
     <action multiple="1">
-        <id>722</id>
+        <id>805</id>
         <name>GROUP_EDIT</name>
         <text>Editar Grupo</text>
         <route>userGroup/edit</route>
     </action>
     <action multiple="1">
-        <id>723</id>
+        <id>806</id>
         <name>GROUP_DELETE</name>
         <text>Eliminar Grupo</text>
         <route>userGroup/delete</route>
     </action>
     <action multiple="1">
-        <id>725</id>
+        <id>802</id>
         <name>GROUP_SEARCH</name>
         <text>Buscar Grupo</text>
         <route>userGroup/search</route>
     </action>
     <action multiple="1">
-        <id>730</id>
+        <id>903</id>
         <name>PROFILE_VIEW</name>
         <text>Ver Perfil</text>
         <route>userProfile/view</route>
     </action>
     <action multiple="1">
-        <id>731</id>
+        <id>904</id>
         <name>PROFILE_CREATE</name>
         <text>Nuevo Perfil</text>
         <route>userProfile/create</route>
     </action>
     <action multiple="1">
-        <id>732</id>
+        <id>905</id>
         <name>PROFILE_EDIT</name>
         <text>Editar Perfil</text>
         <route>userProfile/edit</route>
     </action>
     <action multiple="1">
-        <id>733</id>
+        <id>906</id>
         <name>PROFILE_DELETE</name>
         <text>Eliminar Perfil</text>
         <route>userProfile/delete</route>
     </action>
     <action multiple="1">
-        <id>735</id>
+        <id>902</id>
         <name>PROFILE_SEARCH</name>
         <text>Buscar Perfil</text>
         <route>userProfile/search</route>
     </action>
     <action multiple="1">
-        <id>74</id>
+        <id>5010</id>
         <name>USERSETTINGS</name>
         <text>Configuración Usuario</text>
         <route>userSettingsManager/index</route>
     </action>
     <action multiple="1">
-        <id>741</id>
+        <id>5011</id>
         <name>USERSETTINGS_GENERAL</name>
         <text>Preferencias General</text>
         <route>userSettings/general</route>
     </action>
     <action multiple="1">
-        <id>76</id>
+        <id>1401</id>
         <name>NOTIFICATION</name>
         <text>Notificaciones</text>
         <route>notification/index</route>
     </action>
     <action multiple="1">
-        <id>1000</id>
+        <id>1501</id>
         <name>CONFIG</name>
         <text>Configuración</text>
         <route>configManager/index</route>
     </action>
     <action multiple="1">
-        <id>1001</id>
+        <id>1502</id>
         <name>CONFIG_GENERAL</name>
         <text>Configuración General</text>
         <route>configManager/general</route>
     </action>
     <action multiple="1">
-        <id>1010</id>
-        <name>ACCOUNT_CONFIG</name>
+        <id>1510</id>
+        <name>CONFIG_ACCOUNT</name>
         <text>Configuración Cuentas</text>
         <route>account/config</route>
     </action>
     <action multiple="1">
-        <id>1020</id>
-        <name>WIKI_CONFIG</name>
+        <id>1520</id>
+        <name>CONFIG_WIKI</name>
         <text>Configuración Wiki</text>
         <route>wiki/config</route>
     </action>
     <action multiple="1">
-        <id>1030</id>
-        <name>ENCRYPTION_CONFIG</name>
+        <id>1530</id>
+        <name>CONFIG_CRYPT</name>
         <text>Configuración Encriptación</text>
         <route>encryption/config</route>
     </action>
     <action multiple="1">
-        <id>1031</id>
-        <name>ENCRYPTION_REFRESH</name>
+        <id>1531</id>
+        <name>CONFIG_CRYPT_REFRESH</name>
         <text>Actualizar Hash</text>
         <route>encryption/updateHash</route>
     </action>
     <action multiple="1">
-        <id>1032</id>
-        <name>ENCRYPTION_TEMPPASS</name>
+        <id>1532</id>
+        <name>CONFIG_CRYPT_TEMPPASS</name>
         <text>Clave Maestra Temporal</text>
         <route>encryption/createTempPass</route>
     </action>
     <action multiple="1">
-        <id>1040</id>
-        <name>BACKUP_CONFIG</name>
+        <id>1540</id>
+        <name>CONFIG_BACKUP</name>
         <text>Configuración Copia de Seguridad</text>
         <route>backup/config</route>
     </action>
     <action multiple="1">
-        <id>1041</id>
-        <name>BACKUP</name>
+        <id>1541</id>
+        <name>CONFIG_BACKUP_RUN</name>
         <text>Copia de Seguridad</text>
         <route>backup/backup</route>
     </action>
     <action multiple="1">
-        <id>1050</id>
-        <name>IMPORT_CONFIG</name>
+        <id>1550</id>
+        <name>CONFIG_IMPORT</name>
         <text>Configuración Importación</text>
         <route>import/config</route>
     </action>
     <action multiple="1">
-        <id>1051</id>
-        <name>IMPORT_CSV</name>
+        <id>1551</id>
+        <name>CONFIG_IMPORT_CSV</name>
         <text>Importar CSV</text>
         <route>import/csv</route>
     </action>
     <action multiple="1">
-        <id>1052</id>
-        <name>IMPORT_XML</name>
+        <id>1552</id>
+        <name>CONFIG_IMPORT_XML</name>
         <text>Importar XML</text>
         <route>import/xml</route>
     </action>
     <action multiple="1">
-        <id>1060</id>
-        <name>EXPORT_CONFIG</name>
+        <id>1560</id>
+        <name>CONFIG_EXPORT</name>
         <text>Configuración Exportación</text>
         <route>export/config</route>
     </action>
     <action multiple="1">
-        <id>1061</id>
-        <name>EXPORT</name>
+        <id>1561</id>
+        <name>CONFIG_EXPORT_RUN</name>
         <text>Exportación</text>
         <route>export/export</route>
     </action>
     <action multiple="1">
-        <id>1070</id>
-        <name>MAIL_CONFIG</name>
+        <id>1570</id>
+        <name>CONFIG_MAIL</name>
         <text>Configuración Email</text>
         <route>mail/config</route>
     </action>
     <action multiple="1">
-        <id>1080</id>
-        <name>LDAP_CONFIG</name>
+        <id>1580</id>
+        <name>CONFIG_LDAP</name>
         <text>Configuración LDAP</text>
         <route>ldap/config</route>
     </action>
     <action multiple="1">
-        <id>1081</id>
-        <name>LDAP_SYNC</name>
+        <id>1581</id>
+        <name>CONFIG_LDAP_SYNC</name>
         <text>Sincronización LDAP</text>
         <route>ldap/sync</route>
     </action>
     <action multiple="1">
-        <id>6701</id>
+        <id>1311</id>
         <name>ACCOUNTMGR_HISTORY</name>
         <text>Gestión de Cuenta (H)</text>
         <route>accountHistoryManager/index</route>
     </action>
     <action multiple="1">
-        <id>6731</id>
-        <name>ACCOUNTMGR_DELETE_HISTORY</name>
+        <id>1314</id>
+        <name>ACCOUNTMGR_HISTORY_DELETE</name>
         <text>Eliminar Cuenta</text>
         <route>accountHistoryManager/delete</route>
     </action>
     <action multiple="1">
-        <id>6751</id>
-        <name>ACCOUNTMGR_SEARCH_HISTORY</name>
+        <id>1312</id>
+        <name>ACCOUNTMGR_HISTORY_SEARCH</name>
         <text>Buscar Cuenta</text>
         <route>accountHistoryManager/search</route>
     </action>
     <action multiple="1">
-        <id>6771</id>
-        <name>ACCOUNTMGR_RESTORE</name>
+        <id>1315</id>
+        <name>ACCOUNTMGR_HISTORY_RESTORE</name>
         <text>Restaurar Cuenta</text>
         <route>accountManager/restore</route>
     </action>
     <action multiple="1">
-        <id>760</id>
+        <id>1403</id>
         <name>NOTIFICATION_VIEW</name>
         <text>Ver Notificación</text>
         <route>notification/view</route>
     </action>
     <action multiple="1">
-        <id>761</id>
+        <id>1404</id>
         <name>NOTIFICATION_CREATE</name>
         <text>Crear Notificación</text>
         <route>notification/create</route>
     </action>
     <action multiple="1">
-        <id>762</id>
+        <id>1405</id>
         <name>NOTIFICATION_EDIT</name>
         <text>Editar Notificación</text>
         <route>notification/edit</route>
     </action>
     <action multiple="1">
-        <id>763</id>
+        <id>1406</id>
         <name>NOTIFICATION_DELETE</name>
         <text>Eliminar Notificación</text>
         <route>notification/delete</route>
     </action>
     <action multiple="1">
-        <id>764</id>
+        <id>1407</id>
         <name>NOTIFICATION_CHECK</name>
         <text>Marcar Notificación</text>
         <route>notification/check</route>
     </action>
     <action multiple="1">
-        <id>765</id>
+        <id>1402</id>
         <name>NOTIFICATION_SEARCH</name>
         <text>Buscar Notificación</text>
         <route>notification/search</route>