diff --git a/main.inc.php b/main.inc.php
index 35c5090..f9d8400 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bratonien Tools
-Version: 0.14.1
+Version: 0.14.2
 Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
 Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
 Author: Bratonien
@@ -12,86 +12,12 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-define('BRATONIEN_TOOLS_ID', basename(dirname(__FILE__)));
+const BRATONIEN_TOOLS_ID = 'bratonien_tools';
+const BRATONIEN_TOOLS_VERSION = '0.14.2';
 define('BRATONIEN_TOOLS_PATH', PHPWG_PLUGINS_PATH . BRATONIEN_TOOLS_ID . '/');
 
-require_once(BRATONIEN_TOOLS_PATH . 'include/watermark_runtime.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/public_selection.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/picture_navigation.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/batch_titles.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'include/album_shares.inc.php');
-
 add_event_handler('get_admin_plugin_menu_links', 'bratonien_tools_admin_menu');
-add_event_handler('get_derivative_url', 'bratonien_tools_filter_derivative_url', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
-add_event_handler('loc_end_element_set_global', 'bratonien_tools_batch_titles_register_action');
-add_event_handler('element_set_global_action', 'bratonien_tools_batch_titles_apply', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
-add_event_handler('init', 'bratonien_tools_prepare_private_album_permissions', EVENT_HANDLER_PRIORITY_NEUTRAL - 20);
-add_event_handler('init', 'bratonien_tools_preserve_private_album_access', EVENT_HANDLER_PRIORITY_NEUTRAL - 10);
-add_event_handler('init', 'bratonien_tools_album_shares_init');
-add_event_handler('delete_categories', 'bratonien_tools_album_shares_on_delete_categories');
+add_event_handler('loc_end_page_header', 'bratonien_tools_load_public_assets');
 
-/**
- * Piwigo's per-album permissions form rewrites the complete direct-user
- * permission list when an album is saved as private. Add the acting user to
- * that submitted list on the public -> private transition so Piwigo itself
- * persists the permission together with the other selected users.
- */
-function bratonien_tools_prepare_private_album_permissions()
-{
-  global $user;
-
-  if (
-    !defined('IN_ADMIN')
-    || $_SERVER['REQUEST_METHOD'] !== 'POST'
-    || empty($user['id'])
-    || (string)($_POST['status'] ?? '') !== 'private'
-  )
-  {
-    return;
-  }
-
-  $page = (string)($_GET['page'] ?? '');
-  if (!preg_match('/^album-(\d+)-permissions$/', $page, $matches))
-  {
-    return;
-  }
-
-  $category_id = (int)$matches[1];
-  if ($category_id < 1)
-  {
-    return;
-  }
-
-  $result = pwg_query('SELECT status FROM '.CATEGORIES_TABLE.' WHERE id = '.$category_id.' LIMIT 1');
-  if (!pwg_db_num_rows($result))
-  {
-    return;
-  }
-
-  $category = pwg_db_fetch_assoc($result);
-  if ($category['status'] !== 'public')
-  {
-    return;
-  }
-
-  $users = isset($_POST['users']) && is_array($_POST['users']) ? $_POST['users'] : array();
-  $current_user_id = (int)$user['id'];
-  $normalized_user_ids = array_map('intval', $users);
-
-  if (!in_array($current_user_id, $normalized_user_ids, true))
-  {
-    $users[] = $current_user_id;
-  }
-
-  $_POST['users'] = $users;
-}
-
-function bratonien_tools_admin_menu($menu)
-{
-  $menu[] = array(
-    'NAME' => 'Bratonien Tools',
-    'URL' => get_root_url() . 'admin.php?page=plugin-' . BRATONIEN_TOOLS_ID,
-  );
-
-  return $menu;
-}
+require_once(BRATONIEN_TOOLS_PATH . 'include/admin.inc.php');
+require_once(BRATONIEN_TOOLS_PATH . 'include/public.inc.php');