diff --git a/.eslintrc b/.eslintrc
index b824e9df..dec82d92 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,15 +7,14 @@
     "root": true,
     "parser": "vue-eslint-parser",
     "parserOptions": {
-        "parser": "@typescript-eslint/parser",
+        "parser": "@typescript-eslint/parser"
     },
     "extends": [
-        "plugin:vue/strongly-recommended",
         "eslint:recommended",
-        "@vue/typescript/recommended",
-        "prettier",
+        "plugin:vue/vue3-recommended",
+        "prettier"
     ],
-    "plugins": ["@typescript-eslint", "prettier"],
+    "plugins": ["prettier"],
     "rules": {
         "prettier/prettier": [
             "error",
@@ -31,5 +30,8 @@
                 "endOfLine": "auto"
             }
         ]
+    },
+    "globals": {
+        "NodeJS": true
     }
 }
diff --git a/README.md b/README.md
index 735950a6..8b0e607b 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ The `config/preferences.json` file specifies application preferences. The availa
 
 | field | type | default | description |
 |-------|------|---------|-------------|
+| minRightForPublicMessages             | number |  -1 | Min. right to send public messages |
 | minRightForPrivateMessages            | number |  -1 | Min. right to send private messages |
 | minRightForShortTermMessageHistory    | number |  -1 | Min. right to access short term room message history |
 | minRightForMessageHistory             | number |  -1 | Min. right to access full room message history |
@@ -116,6 +117,7 @@ The `config/preferences.json` file specifies application preferences. The availa
 | maxNewlinesPerMessage                 | number |  20 | Max. number of newlines per message |
 | maxConsecutiveMessages                | number |  1  | Max. number of consecutive messages in a room |
 | maxMessageMergeDelayMin               | number |  10 | Max. minutes before not merging consecutive messages |
+| daysBeforeMessageFuzz                 | number |  7  | Number of days before messages are fuzzed, if ExtraSecurityPluginGroup is enabled |
 | invertedBlacklist                     | boolean |  false  | Whether blacklisted users can not see messages from users who blacklisted them |
 | messagesCooldown                      | ([number, number])[] | [ [ -1, 0] ] | Minimum duration between two consecutive messages for each right level, sorted by ascending right number |
 
@@ -153,6 +155,11 @@ When the source files change, the build processes re-runs automatically.
 
 ### Add features
 
+Refer to [the Wiki](https://github.com/skychatorg/skychat/wiki) guides to contribute:
+- [Write a plugin](https://github.com/skychatorg/skychat/wiki/SkyChat-Plugin-Development-Documentation)
+- [Example: Write the TypingList Plugin](https://github.com/skychatorg/skychat/wiki/Room-Plugin-Example:-Writing-the-TypingList-Plugin)
+- [Plugin hooks](https://github.com/skychatorg/skychat/wiki/SkyChat-Plugin-Hooks-Documentation)
+
 Please use only one of the following to suggest new features (or bug fixes):
 - Create a pull request
 - Open an issue with your proposal 
diff --git a/app/api/SkyChatClient.ts b/app/api/SkyChatClient.ts
index 7659aefc..a18fc307 100644
--- a/app/api/SkyChatClient.ts
+++ b/app/api/SkyChatClient.ts
@@ -69,6 +69,7 @@ export class SkyChatClient extends EventEmitter {
     static readonly CURSOR_DECAY_DELAY = 10 * 1e3;
 
     static readonly LOCAL_STORAGE_TOKEN_KEY = 'skychat-token';
+    static readonly LOCAL_STORAGE_ROOM_ID = 'skychat-room-id';
 
     private _websocket: WebSocket | null = null;
 
@@ -96,7 +97,11 @@ export class SkyChatClient extends EventEmitter {
     private _currentPlayerChannelId: number | null = null;
     private _currentPlayerChannel: SanitizedPlayerChannel | null = null;
     private _playerApiSearchResult: { type: string; items: Array<VideoInfo> } | null = null;
-    private _player: { current: QueuedVideoInfo | null; queue: QueuedVideoInfo[]; cursor: number } = { current: null, queue: [], cursor: 0 };
+    private _player: { current: QueuedVideoInfo | null; queue: QueuedVideoInfo[]; cursor: number } = {
+        current: null,
+        queue: [],
+        cursor: 0,
+    };
     private _playerLastUpdate: Date | null = null;
 
     constructor(public readonly url: string) {
@@ -230,7 +235,8 @@ export class SkyChatClient extends EventEmitter {
             this._user = ownUser.user;
         }
         ({ messageIdToLastSeenUsers: this._messageIdToLastSeenUsers } = this._generateMessageIdToLastSeenUsers());
-        ({ roomConnectedUsers: this._roomConnectedUsers, playerChannelUsers: this._playerChannelUsers } = this._generateRoomConnectedUsersAndPlayerChannelUsers());
+        ({ roomConnectedUsers: this._roomConnectedUsers, playerChannelUsers: this._playerChannelUsers } =
+            this._generateRoomConnectedUsersAndPlayerChannelUsers());
     }
 
     private _onRoomList(rooms: Array<SanitizedRoom>) {
@@ -238,8 +244,11 @@ export class SkyChatClient extends EventEmitter {
         this.emit('update', this.state);
     }
 
-    private _onCurrentRoomId(currentRoomId: number) {
+    private _onCurrentRoomId(currentRoomId: number | null) {
         this._currentRoomId = currentRoomId;
+        if (typeof localStorage !== 'undefined' && currentRoomId !== null) {
+            localStorage.setItem(SkyChatClient.LOCAL_STORAGE_ROOM_ID, currentRoomId.toString());
+        }
         this.emit('update', this.state);
         // Ask for message history if joined a room
         currentRoomId !== null && this.sendMessage('/messagehistory');
@@ -507,7 +516,12 @@ export class SkyChatClient extends EventEmitter {
         if (typeof localStorage !== 'undefined') {
             const authToken = localStorage.getItem(SkyChatClient.LOCAL_STORAGE_TOKEN_KEY);
             if (authToken) {
-                this._sendEvent('set-token', JSON.parse(authToken));
+                const rawRoomId = localStorage.getItem(SkyChatClient.LOCAL_STORAGE_ROOM_ID);
+                const roomId = rawRoomId ? parseInt(rawRoomId) : null;
+                this._sendEvent('set-token', {
+                    ...JSON.parse(authToken),
+                    roomId: roomId ?? undefined,
+                });
             }
         }
         this.emit('update', this.state);
diff --git a/app/client/src/App.vue b/app/client/src/App.vue
index 0c5a4f9a..32ac9c50 100644
--- a/app/client/src/App.vue
+++ b/app/client/src/App.vue
@@ -7,6 +7,7 @@ import ProfileModal from '@/components/modal/ProfileModal.vue';
 import PlayerQueueModal from '@/components/modal/PlayerQueueModal.vue';
 import OngoingConvertsModal from '@/components/modal/OngoingConvertsModal.vue';
 import VideoConverterModal from '@/components/modal/VideoConverterModal.vue';
+import ManageRoomsModal from '@/components/modal/ManageRoomsModal.vue';
 </script>
 
 <template>
@@ -19,6 +20,7 @@ import VideoConverterModal from '@/components/modal/VideoConverterModal.vue';
         <VideoConverterModal />
         <GalleryModal />
         <PlayerQueueModal />
+        <ManageRoomsModal />
         <RouterView class="grow" />
     </div>
 </template>
diff --git a/app/client/src/components/message/NewMessageForm.vue b/app/client/src/components/message/NewMessageForm.vue
index 19c9b74a..0ad382d8 100644
--- a/app/client/src/components/message/NewMessageForm.vue
+++ b/app/client/src/components/message/NewMessageForm.vue
@@ -4,7 +4,6 @@ import { useAppStore } from '@/stores/app';
 import { useClientStore } from '@/stores/client';
 import { AudioRecorder } from '@/lib/AudioRecorder';
 import { RisiBank } from 'risibank-web-api';
-import HoverCard from '@/components/util/HoverCard.vue';
 
 const MESSAGE_HISTORY_LENGTH = 500;
 
@@ -22,7 +21,7 @@ onMounted(() => {
     message.value.focus();
 });
 
-const typingListStr = computed(() => {
+const typingListText = computed(() => {
     let typingUsers = client.state.typingList;
 
     typingUsers = typingUsers.filter((user) => user.username.toLowerCase() !== client.state.user.username.toLowerCase());
@@ -43,10 +42,21 @@ const typingListStr = computed(() => {
     return 'multiple users are currently typing..';
 });
 
+const textAreaPlaceholder = computed(() => {
+    if (!client.state.currentRoom) {
+        return '❌ Disconnected';
+    }
+    let placeholder = `New message / ${client.state.currentRoom.name}`;
+    if (client.state.currentRoom.plugins.messagelimiter) {
+        placeholder += ` (char limit: ${client.state.currentRoom.plugins.messagelimiter})`;
+    }
+    return placeholder;
+});
+
 // Watch when the new message input changes. The change does not necessarily come from this component, as the message input can be prepared elsewhere.
 watch(
     () => app.newMessage,
-    (newValue, oldValue) => {
+    (newValue) => {
         // Auto-set the message value
         if (newValue !== message.value.value) {
             message.value.value = newValue;
@@ -188,7 +198,7 @@ const recordingAudioStopCb = ref(null);
 const uploadAudio = async function () {
     if (recordingAudio.value) {
         // Stop recording
-        const { blob, uri, audio } = await recordingAudioStopCb.value();
+        const { blob } = await recordingAudioStopCb.value();
         client.sendAudio(blob);
     } else {
         // Start recording
@@ -229,7 +239,7 @@ const cancelAudio = function () {
                     <label class="form-control cursor-pointer w-12" for="file-input">
                         <fa icon="upload" />
                     </label>
-                    <input ref="fileUploadInput" @change="onFileInputChange" type="file" id="file-input" class="hidden" />
+                    <input id="file-input" ref="fileUploadInput" type="file" class="hidden" @change="onFileInputChange" />
                 </div>
 
                 <!-- Send audio -->
@@ -246,7 +256,7 @@ const cancelAudio = function () {
 
                 <!-- RisiBank -->
                 <div title="Add a media from RisiBank" class="flex flex-col justify-end">
-                    <button @click="openRisiBank" class="form-control ml-2 w-12 h-10 align-bottom">
+                    <button class="form-control ml-2 w-12 h-10 align-bottom" @click="openRisiBank">
                         <img src="/assets/images/icons/risibank.png" class="w-4 h-4" />
                     </button>
                 </div>
@@ -266,15 +276,16 @@ const cancelAudio = function () {
                 <div class="grow flex flex-col">
                     <!-- Typing list -->
                     <p class="h-5 pl-2 text-xs text-skygray-lightest">
-                        {{ typingListStr }}
+                        {{ typingListText }}
                     </p>
                     <textarea
                         ref="message"
                         :rows="messageTextAreaRows"
                         class="mousetrap form-control lg:ml-2 scrollbar resize-none"
                         type="text"
-                        :placeholder="client.state.currentRoom ? `New message / ${client.state.currentRoom.name}` : '❌ Disconnected'"
+                        :placeholder="textAreaPlaceholder"
                         :disabled="!client.state.currentRoom"
+                        :maxlength="client.state.currentRoom.plugins.messagelimiter ?? null"
                         @input="onMessageInput"
                         @keyup.up.exact="onNavigateIntoHistory($event, -1)"
                         @keyup.down.exact="onNavigateIntoHistory($event, 1)"
@@ -286,7 +297,7 @@ const cancelAudio = function () {
 
                 <!-- Send button -->
                 <div title="Send" class="flex flex-col justify-end">
-                    <button @click="sendMessage" class="form-control ml-2 h-fit align-bottom">
+                    <button class="form-control ml-2 h-fit align-bottom" @click="sendMessage">
                         <fa icon="paper-plane" />
                     </button>
                 </div>
diff --git a/app/client/src/components/modal/ManageRoomsModal.vue b/app/client/src/components/modal/ManageRoomsModal.vue
new file mode 100644
index 00000000..adf70877
--- /dev/null
+++ b/app/client/src/components/modal/ManageRoomsModal.vue
@@ -0,0 +1,38 @@
+<script setup>
+import { computed, watch, onMounted, ref } from 'vue';
+import { useClientStore } from '@/stores/client';
+import ModalTemplate from '@/components/modal/ModalTemplate.vue';
+import SingleRoom from '@/components/room/SingleRoom.vue';
+import draggable from 'vuedraggable';
+
+const client = useClientStore();
+
+const publicRooms = computed(() => {
+    return client.state.rooms.filter((room) => !room.isPrivate);
+});
+
+let sortedRooms = ref(publicRooms.value);
+onMounted(() => {
+    sortedRooms.value = publicRooms.value;
+});
+watch(publicRooms, () => {
+    sortedRooms.value = publicRooms.value;
+});
+
+function onMoved() {
+    const sortedRoomIds = sortedRooms.value.map((room) => room.id);
+    client.sendMessage('/roomorder ' + sortedRoomIds.join(','));
+}
+</script>
+
+<template>
+    <ModalTemplate id="manageRooms" title="Manage rooms">
+        Manage rooms
+
+        <draggable v-model="sortedRooms" group="rooms" item-key="id" @end="onMoved">
+            <template #item="{ element }">
+                <SingleRoom :room="element">{{ element.name }}</SingleRoom>
+            </template>
+        </draggable>
+    </ModalTemplate>
+</template>
diff --git a/app/client/src/components/room/RoomList.vue b/app/client/src/components/room/RoomList.vue
index 19736f7f..05438bdd 100644
--- a/app/client/src/components/room/RoomList.vue
+++ b/app/client/src/components/room/RoomList.vue
@@ -1,9 +1,11 @@
 <script setup>
 import { computed } from 'vue';
 import { useClientStore } from '@/stores/client';
+import { useAppStore } from '@/stores/app';
 import SingleRoom from '@/components/room/SingleRoom.vue';
 import SectionTitle from '@/components/util/SectionTitle.vue';
 
+const app = useAppStore();
 const client = useClientStore();
 
 // Whether has unread
@@ -21,6 +23,10 @@ const hasUnread = computed(() => {
 
     return false;
 });
+
+function manageRooms() {
+    app.toggleModal('manageRooms');
+}
 </script>
 
 <template>
@@ -32,6 +38,9 @@ const hasUnread = computed(() => {
         >
             Rooms
             <fa v-if="hasUnread" icon="comments" />
+            <a v-if="client.state.op" class="ml-auto cursor-pointer" @click="manageRooms">
+                <fa icon="gear" />
+            </a>
         </SectionTitle>
         <div class="px-2 h-0 grow overflow-y-auto scrollbar">
             <SingleRoom v-for="room in client.state.rooms" :key="room.id" :room="room" />
diff --git a/app/client/src/components/room/SingleRoom.vue b/app/client/src/components/room/SingleRoom.vue
index cf1a866f..98563e88 100644
--- a/app/client/src/components/room/SingleRoom.vue
+++ b/app/client/src/components/room/SingleRoom.vue
@@ -61,6 +61,13 @@ const formattedName = computed(() => {
     }
 });
 
+/**
+ * Return whether this room is protected
+ */
+const isProtected = computed(() => {
+    return Boolean(props.room.plugins?.roomprotect);
+});
+
 // Choose icon to show and icon color
 const icon = computed(() => {
     if (props.room.isPrivate) {
@@ -71,9 +78,16 @@ const icon = computed(() => {
                 classes: selected.value ? 'text-skygray-white' : 'text-skygray-lightest',
             };
         }
+        return {
+            name: 'user',
+            classes: selected.value ? 'text-skygray-white' : 'text-skygray-lightest',
+        };
+    }
+    if (isProtected.value) {
         return {
             name: 'lock',
             classes: selected.value ? 'text-skygray-white' : 'text-skygray-lightest',
+            title: `This room is protected. The minimum right to join is ${props.room.plugins.roomprotect}`,
         };
     }
     return null;
@@ -81,11 +95,17 @@ const icon = computed(() => {
 </script>
 
 <template>
-    <HoverCard :use-border-radius="true" :border-color="'rgb(var(' + borderColor + '))'" :selectable="true" :selected="selected" class="cursor-pointer">
+    <HoverCard
+        :use-border-radius="true"
+        :border-color="'rgb(var(' + borderColor + '))'"
+        :selectable="true"
+        :selected="selected"
+        class="cursor-pointer"
+    >
         <div @click="client.state.currentRoomId !== room.id && client.join(room.id)" class="py-2 px-3 flex flex-row select-none">
             <!-- Room name -->
             <div class="grow whitespace-nowrap w-0 overflow-hidden text-ellipsis pr-2">
-                <fa v-if="icon" class="mr-1" :class="icon.classes" :icon="icon.name" />
+                <fa v-if="icon" class="mr-1" :class="icon.classes" :icon="icon.name" :title="icon.title" />
                 {{ formattedName }}
             </div>
 
diff --git a/app/client/src/icons.js b/app/client/src/icons.js
index 12a52a17..d210ff63 100644
--- a/app/client/src/icons.js
+++ b/app/client/src/icons.js
@@ -58,6 +58,8 @@ import {
     faFileVideo,
     faInfo,
     faSpinner,
+    faUser,
+    faGear,
 } from '@fortawesome/free-solid-svg-icons';
 
 library.add(
@@ -119,6 +121,8 @@ library.add(
     faFileVideo,
     faInfo,
     faSpinner,
+    faUser,
+    faGear,
 );
 
 export default library;
diff --git a/app/client/src/stores/app.js b/app/client/src/stores/app.js
index 3fb9f016..ee713720 100644
--- a/app/client/src/stores/app.js
+++ b/app/client/src/stores/app.js
@@ -100,6 +100,11 @@ export const useAppStore = defineStore('app', {
              * List of next videos to play
              */
             playerQueue: false,
+
+            /**
+             * Room management modal
+             */
+            manageRooms: false,
         },
     }),
 
diff --git a/app/client/src/stores/client.js b/app/client/src/stores/client.js
index d3fabc24..57b6219b 100644
--- a/app/client/src/stores/client.js
+++ b/app/client/src/stores/client.js
@@ -119,11 +119,9 @@ export const useClientStore = defineStore('client', {
 
         /**
          * Login
-         * @param {string} username
-         * @param {string} password
          */
-        login: ({ username, password }) => {
-            client.login(username, password);
+        login: ({ username, password, roomId }) => {
+            client.login(username, password, roomId);
         },
 
         /**
@@ -136,8 +134,8 @@ export const useClientStore = defineStore('client', {
         /**
          * Register
          */
-        register: ({ username, password }) => {
-            client.register(username, password);
+        register: ({ username, password, roomId }) => {
+            client.register(username, password, roomId);
         },
 
         /**
diff --git a/app/client/src/views/Home.vue b/app/client/src/views/Home.vue
index 153c8dd8..9804a403 100644
--- a/app/client/src/views/Home.vue
+++ b/app/client/src/views/Home.vue
@@ -31,7 +31,10 @@ const joinAsGuest = function () {
 };
 
 const login = function () {
-    client.login({ username: state.username, password: state.password });
+    client.login({
+        username: state.username,
+        password: state.password,
+    });
 };
 </script>
 
@@ -42,13 +45,32 @@ const login = function () {
                 <!-- Main content -->
                 <p class="font-bold mt-2 mb-8 text-3xl">Login / Register</p>
                 <form class="px-4 grid grid-cols-4 gap-4" @submit="login">
-                    <input class="form-control col-start-1 col-span-4" type="text" autocomplete="username" placeholder="Username" v-model="state.username" />
-                    <input class="form-control col-start-1 col-span-4" type="password" autocomplete="current-password" placeholder="Password" v-model="state.password" />
+                    <input
+                        v-model="state.username"
+                        class="form-control col-start-1 col-span-4"
+                        type="text"
+                        autocomplete="username"
+                        placeholder="Username"
+                    />
+                    <input
+                        v-model="state.password"
+                        class="form-control col-start-1 col-span-4"
+                        type="password"
+                        autocomplete="current-password"
+                        placeholder="Password"
+                    />
                     <button type="submit" class="form-control col-span-4 lg:col-span-2">Login</button>
-                    <button class="form-control col-span-4 lg:col-span-2" @click.prevent.stop="client.register({ username: state.username, password: state.password })">Register</button>
+                    <button
+                        class="form-control col-span-4 lg:col-span-2"
+                        @click.prevent.stop="client.register({ username: state.username, password: state.password })"
+                    >
+                        Register
+                    </button>
                     <hr class="col-span-4" />
                     <p class="col-span-4">or</p>
-                    <button @click.prevent.stop="joinAsGuest" class="form-control col-span-4 lg:col-start-2 lg:col-span-2">Continue as guest</button>
+                    <button class="form-control col-span-4 lg:col-start-2 lg:col-span-2" @click.prevent.stop="joinAsGuest">
+                        Continue as guest
+                    </button>
                 </form>
             </div>
         </div>
diff --git a/app/server/plugins/GlobalPlugin.ts b/app/server/plugins/GlobalPlugin.ts
index 96f036bd..20932f40 100644
--- a/app/server/plugins/GlobalPlugin.ts
+++ b/app/server/plugins/GlobalPlugin.ts
@@ -40,6 +40,16 @@ export abstract class GlobalPlugin extends Plugin {
         return message;
     }
 
+    /**
+     * Execute before a connection registers
+     * @param payload
+     * @param connection
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    public async onBeforeRegister(payload: unknown, connection: Connection): Promise<void> {
+        void 0;
+    }
+
     /**
      * When a connection is created
      * @abstract
diff --git a/app/server/plugins/Plugin.ts b/app/server/plugins/Plugin.ts
index 3779394b..5c558938 100644
--- a/app/server/plugins/Plugin.ts
+++ b/app/server/plugins/Plugin.ts
@@ -289,7 +289,7 @@ export abstract class Plugin {
      * @param _data
      * @returns Whether the data was handled. If returning true, no other plugin will be able to handle binary data.
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line no-unused-vars
     public async onBinaryDataReceived(_connection: Connection, _messageType: number, _data: Buffer): Promise<boolean> {
         return false;
     }
diff --git a/app/server/plugins/RoomPlugin.ts b/app/server/plugins/RoomPlugin.ts
index a52351ce..1526ad47 100644
--- a/app/server/plugins/RoomPlugin.ts
+++ b/app/server/plugins/RoomPlugin.ts
@@ -36,7 +36,7 @@ export abstract class RoomPlugin extends Plugin {
     /**
      * Get a summary of this plugin state to include in the room list
      */
-    public getRoomSummary(): any {
+    public getRoomSummary(): unknown {
         return null;
     }
 
@@ -46,7 +46,7 @@ export abstract class RoomPlugin extends Plugin {
      * @param message
      * @param _connection
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line no-unused-vars
     public async onBeforeMessageBroadcastHook(message: Message, _connection?: Connection): Promise<Message> {
         return message;
     }
@@ -55,9 +55,10 @@ export abstract class RoomPlugin extends Plugin {
      * Executed before a connection joins a room
      * @abstract
      * @param _connection
+     * @param _room
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    public async onBeforeConnectionJoinedRoom(_connection: Connection): Promise<void> {
+    // eslint-disable-next-line no-unused-vars
+    public async onBeforeConnectionJoinedRoom(_connection: Connection, _room: Room): Promise<void> {
         void 0;
     }
 
@@ -66,7 +67,7 @@ export abstract class RoomPlugin extends Plugin {
      * @abstract
      * @param _connection
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line no-unused-vars
     public async onConnectionJoinedRoom(_connection: Connection): Promise<void> {
         void 0;
     }
@@ -76,7 +77,7 @@ export abstract class RoomPlugin extends Plugin {
      * @abstract
      * @param _connection
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line no-unused-vars
     public async onConnectionLeftRoom(_connection: Connection): Promise<void> {
         void 0;
     }
@@ -86,7 +87,8 @@ export abstract class RoomPlugin extends Plugin {
  * Defines default constructor for a room plugin (required for TypeScript)
  */
 export interface RoomPluginConstructor {
-    new (room: Room): RoomPlugin;
+    // eslint-disable-next-line no-unused-vars
+    new (_room: Room): RoomPlugin;
     commandName: string;
     commandAliases: string[];
     defaultDataStorageValue?: any;
diff --git a/app/server/plugins/core/room/HelpPlugin.ts b/app/server/plugins/core/room/HelpPlugin.ts
index 7290e401..f007cc0a 100644
--- a/app/server/plugins/core/room/HelpPlugin.ts
+++ b/app/server/plugins/core/room/HelpPlugin.ts
@@ -1,4 +1,4 @@
-import { PluginCommandRules } from '../../Plugin';
+import { Plugin, PluginCommandRules } from '../../Plugin';
 import { RoomPlugin } from '../../RoomPlugin';
 import { Connection } from '../../../skychat/Connection';
 import striptags from 'striptags';
@@ -11,7 +11,9 @@ export class HelpPlugin extends RoomPlugin {
 
     async run(alias: string, param: string, connection: Connection): Promise<void> {
         // Group commands by main name
-        const commandAliases = Object.keys(this.room.commands);
+        const commandAliases: [string, Plugin][] = (Object.entries(this.room.commands) as [string, Plugin][]).concat(
+            Object.entries(this.room.manager.commands),
+        );
         let content = '<table class="skychat-table">';
         content += `
             <tr>
@@ -21,9 +23,7 @@ export class HelpPlugin extends RoomPlugin {
                 <th>params</th>
             </tr>    
         `;
-        for (const alias of commandAliases) {
-            const command = this.room.commands[alias];
-
+        for (const [alias, command] of commandAliases) {
             // If user has not the right to access the command, hide it
             if (connection.session.user.right < command.minRight) {
                 continue;
@@ -39,13 +39,14 @@ export class HelpPlugin extends RoomPlugin {
 
             // Get rule object
             const rules: PluginCommandRules = command.rules && command.rules[alias] ? command.rules[alias] : {};
+            const coolDown = Array.isArray(rules.coolDown) ? rules.coolDown.toString() : (rules.coolDown ?? 0) / 1000;
 
             content += `
             <tr>
                 <td>${alias}</td>
                 <td>${command.minRight}</td>
-                <td>${(rules.coolDown || 0) / 1000 || 0}s</td>
-                <td>${(rules.params || []).map((param: any) => param.name).join(', ')}</td>
+                <td>${coolDown}s</td>
+                <td>${(rules.params ?? []).map((param) => param.name).join(', ')}</td>
             </tr>            
             `;
         }
diff --git a/app/server/plugins/core/room/MessageEditPlugin.ts b/app/server/plugins/core/room/MessageEditPlugin.ts
index 25935e00..7338ab8c 100644
--- a/app/server/plugins/core/room/MessageEditPlugin.ts
+++ b/app/server/plugins/core/room/MessageEditPlugin.ts
@@ -2,6 +2,7 @@ import SQL from 'sql-template-strings';
 import { Connection } from '../../../skychat/Connection';
 import { DatabaseHelper } from '../../../skychat/DatabaseHelper';
 import { RoomPlugin } from '../../RoomPlugin';
+import { MessageLimiterPlugin } from '../../security_extra/MessageLimiterPlugin';
 
 export class MessageEditPlugin extends RoomPlugin {
     static readonly commandName = 'edit';
@@ -45,6 +46,9 @@ export class MessageEditPlugin extends RoomPlugin {
         // Edit message
         if (alias === 'edit') {
             const content = param.split(' ').slice(1).join(' ');
+            if (!this.room.getPlugin<MessageLimiterPlugin>(MessageLimiterPlugin.commandName)?.allowMessageEdit(message, content)) {
+                throw new Error(MessageLimiterPlugin.errorMessage);
+            }
             message.edit(content);
         } else {
             message.edit('deleted', '<s>deleted</s>');
diff --git a/app/server/plugins/core/room/MessagePlugin.ts b/app/server/plugins/core/room/MessagePlugin.ts
index f278374f..fe5645cd 100644
--- a/app/server/plugins/core/room/MessagePlugin.ts
+++ b/app/server/plugins/core/room/MessagePlugin.ts
@@ -4,11 +4,12 @@ import { MessageController } from '../../../skychat/MessageController';
 import { RoomPlugin } from '../../RoomPlugin';
 import { DatabaseHelper } from '../../../skychat/DatabaseHelper';
 import SQL from 'sql-template-strings';
+import { MessageLimiterPlugin } from '../../security_extra/MessageLimiterPlugin';
 
 export class MessagePlugin extends RoomPlugin {
     static readonly commandName = 'message';
 
-    readonly minRight = -1;
+    readonly minRight = Config.PREFERENCES.minRightForPublicMessages;
 
     readonly hidden = true;
 
@@ -62,7 +63,14 @@ export class MessagePlugin extends RoomPlugin {
                 Config.PREFERENCES.maxMessageMergeDelayMin * 60 * 1000;
         if (!quoted && tooManyMessages && lastMessageTooRecent) {
             const lastMessage = lastMessages[lastMessages.length - 1];
-            lastMessage.edit(lastMessage.content + '\n' + content);
+            const newContent = lastMessage.content + '\n' + content;
+
+            // Ensure message limit is not reached
+            if (!this.room.getPlugin<MessageLimiterPlugin>(MessageLimiterPlugin.commandName)?.allowMessageEdit(lastMessage, newContent)) {
+                throw new Error(MessageLimiterPlugin.errorMessage);
+            }
+
+            lastMessage.edit(newContent);
             this.room.send('message-edit', lastMessage.sanitized());
             await DatabaseHelper.db.run(SQL`update messages set content = ${lastMessage.content} where id = ${lastMessage.id}`);
             return;
diff --git a/app/server/plugins/core/room/RoomManagerPlugin.ts b/app/server/plugins/core/room/RoomManagerPlugin.ts
index 7e942bab..81b1917e 100644
--- a/app/server/plugins/core/room/RoomManagerPlugin.ts
+++ b/app/server/plugins/core/room/RoomManagerPlugin.ts
@@ -7,7 +7,7 @@ import { Session } from '../../../skychat/Session';
 export class RoomManagerPlugin extends RoomPlugin {
     static readonly commandName = 'room';
 
-    static readonly commandAliases = ['roomset', 'roomcreate', 'roomdelete'];
+    static readonly commandAliases = ['roomset', 'roomcreate', 'roomdelete', 'roomorder'];
 
     readonly rules = {
         room: {},
@@ -23,6 +23,10 @@ export class RoomManagerPlugin extends RoomPlugin {
             ],
         },
         roomdelete: { maxCount: 0 },
+        roomorder: {
+            minCount: 1,
+            params: [{ name: 'offset', pattern: /^\d+(,\d+)*$/ }],
+        },
     };
 
     async run(alias: string, param: string, connection: Connection): Promise<void> {
@@ -38,6 +42,10 @@ export class RoomManagerPlugin extends RoomPlugin {
             case 'roomdelete':
                 await this.handleRoomDelete(param, connection);
                 break;
+
+            case 'roomorder':
+                await this.handleRoomOrder(param, connection);
+                break;
         }
     }
 
@@ -90,4 +98,14 @@ export class RoomManagerPlugin extends RoomPlugin {
         const message = UserController.createNeutralMessage({ id: 0, content: `Room ${this.room.id} has been deleted` });
         connection.send('message', message.sanitized());
     }
+
+    async handleRoomOrder(param: string, connection: Connection): Promise<void> {
+        if (!connection.session.isOP()) {
+            throw new Error('Only OP can reorder rooms');
+        }
+        const order = param.split(',').map((offset) => parseInt(offset));
+        await this.room.manager.reOrderRooms(order);
+        const message = UserController.createNeutralMessage({ id: 0, content: `Room have been reordered` });
+        connection.send('message', message.sanitized());
+    }
 }
diff --git a/app/server/plugins/player/PlayerPlugin.ts b/app/server/plugins/player/PlayerPlugin.ts
index fa0dd2db..5f08cf67 100644
--- a/app/server/plugins/player/PlayerPlugin.ts
+++ b/app/server/plugins/player/PlayerPlugin.ts
@@ -117,7 +117,7 @@ export class PlayerPlugin extends GlobalPlugin {
         super(manager);
 
         for (const fetcherName of Object.keys(PlayerPlugin.FETCHERS)) {
-            this.rules[fetcherName] = {
+            (this.rules as any)[fetcherName] = {
                 minCount: 1,
                 maxCallsPer10Seconds: 10,
                 params: [{ name: 'action', pattern: /./ }],
@@ -477,12 +477,10 @@ export class PlayerPlugin extends GlobalPlugin {
                     throw new Error('You are not authorized to perform this action');
                 }
                 // Vote skip
-                // eslint-disable-next-line no-case-declarations
-                const playerData = channel.getPlayerData();
-                if (this.manager.getPlugin('poll') && playerData.current) {
+                if (this.manager.getPlugin('poll') && channel.getPlayerData().current) {
                     const poll = await (this.manager.getPlugin('poll') as PollPlugin).poll(
                         `${channel.name}: Skip media?`,
-                        `${connection.session.identifier} wants to skip ${playerData.current.video.title}. Skip media?`,
+                        `${connection.session.identifier} wants to skip ${channel.getPlayerData().current?.video.title}. Skip media?`,
                         {
                             audience: channel.sessions,
                             defaultValue: false,
diff --git a/app/server/plugins/player/fetcher/IFrameFetcher.ts b/app/server/plugins/player/fetcher/IFrameFetcher.ts
index 60be3611..483ea421 100644
--- a/app/server/plugins/player/fetcher/IFrameFetcher.ts
+++ b/app/server/plugins/player/fetcher/IFrameFetcher.ts
@@ -3,7 +3,18 @@ import { PlayerPlugin } from '../PlayerPlugin';
 import { VideoFetcher } from './VideoFetcher';
 
 export class IFrameFetcher implements VideoFetcher {
-    static ALLOWED_SOURCES: string[] = ['https://w.soundcloud.com', 'https://airmash.online', 'https://scdn.nrjaudio.fm', 'https://bruh.io', 'https://stream-49.zeno.fm', 'https://digdig.io'];
+    static ALLOWED_SOURCES: string[] = [
+        'https://w.soundcloud.com',
+        'https://airmash.online',
+        'https://scdn.nrjaudio.fm',
+        'https://bruh.io',
+        'https://stream-49.zeno.fm',
+        'https://digdig.io',
+        'https://streamable.com',
+        'https://catbox.moe',
+        'https://vocaroo.com',
+        'https://voca.ro',
+    ];
 
     /**
      * @override
diff --git a/app/server/plugins/security_extra/BunkerPlugin.ts b/app/server/plugins/security_extra/BunkerPlugin.ts
new file mode 100644
index 00000000..6d5f04ad
--- /dev/null
+++ b/app/server/plugins/security_extra/BunkerPlugin.ts
@@ -0,0 +1,55 @@
+import { UserController } from '../../skychat/UserController';
+import { Connection } from '../../skychat/Connection';
+import { GlobalPlugin } from '../GlobalPlugin';
+import { RoomManager } from '../../skychat/RoomManager';
+import { Message } from '../../skychat/Message';
+
+export class BunkerPlugin extends GlobalPlugin {
+    static readonly commandName = 'bunker';
+
+    readonly opOnly = true;
+
+    readonly rules = {
+        bunker: {
+            minCount: 1,
+            maxCount: 1,
+            params: [
+                {
+                    name: 'mode',
+                    pattern: /^(off|on)$/,
+                },
+            ],
+        },
+    };
+
+    protected storage: boolean = false;
+
+    constructor(manager: RoomManager) {
+        super(manager);
+
+        this.loadStorage();
+    }
+
+    async run(_alias: string, param: string, connection: Connection): Promise<void> {
+        await this.handleBunker(param, connection);
+    }
+
+    async handleBunker(param: string, connection: Connection) {
+        this.storage = param === 'on';
+        this.syncStorage();
+
+        connection.send(
+            'message',
+            new Message({
+                content: 'Bunker mode: ' + (this.storage ? 'on' : 'off'),
+                user: UserController.getNeutralUser(),
+            }).sanitized(),
+        );
+    }
+
+    async onBeforeRegister(): Promise<void> {
+        if (this.storage) {
+            throw new Error('Application currently in bunker mode. Registration is disabled.');
+        }
+    }
+}
diff --git a/app/server/plugins/security_extra/ExtraSecurityPluginGroup.ts b/app/server/plugins/security_extra/ExtraSecurityPluginGroup.ts
index f7b16d57..88d30add 100644
--- a/app/server/plugins/security_extra/ExtraSecurityPluginGroup.ts
+++ b/app/server/plugins/security_extra/ExtraSecurityPluginGroup.ts
@@ -1,12 +1,15 @@
 import { PluginGroup } from '../PluginGroup';
+import { RoomProtectPlugin } from './RoomProtectPlugin';
 import { HistoryClearPlugin } from './HistoryClearPlugin';
 import { LogFuzzerPlugin } from './LogFuzzerPlugin';
 import { TorBanPlugin } from './TorBanPlugin';
 import { TrackerPlugin } from './TrackerPlugin';
 import { UsurpPlugin } from './UsurpPlugin';
+import { BunkerPlugin } from './BunkerPlugin';
+import { MessageLimiterPlugin } from './MessageLimiterPlugin';
 
 export class ExtraSecurityPluginGroup extends PluginGroup {
-    roomPluginClasses = [HistoryClearPlugin, UsurpPlugin];
+    roomPluginClasses = [MessageLimiterPlugin, RoomProtectPlugin, HistoryClearPlugin, UsurpPlugin];
 
-    globalPluginClasses = [LogFuzzerPlugin, TorBanPlugin, TrackerPlugin];
+    globalPluginClasses = [BunkerPlugin, LogFuzzerPlugin, TorBanPlugin, TrackerPlugin];
 }
diff --git a/app/server/plugins/security_extra/LogFuzzerPlugin.ts b/app/server/plugins/security_extra/LogFuzzerPlugin.ts
index 8db97c54..4fbe6bf4 100644
--- a/app/server/plugins/security_extra/LogFuzzerPlugin.ts
+++ b/app/server/plugins/security_extra/LogFuzzerPlugin.ts
@@ -2,11 +2,12 @@ import SQL from 'sql-template-strings';
 import { DatabaseHelper } from '../../skychat/DatabaseHelper';
 import { GlobalPlugin } from '../GlobalPlugin';
 import { RoomManager } from '../../skychat/RoomManager';
+import { Config } from '../../skychat/Config';
 
 export class LogFuzzerPlugin extends GlobalPlugin {
-    static readonly DURATION_BEFORE_FUZZ = 20 * 24 * 60 * 60 * 1000;
+    static readonly DURATION_BEFORE_FUZZ = Config.PREFERENCES.daysBeforeMessageFuzz * 24 * 60 * 60 * 1000;
 
-    static readonly FUZZ_COOLDOWN = LogFuzzerPlugin.DURATION_BEFORE_FUZZ;
+    static readonly FUZZ_COOLDOWN = Math.min(LogFuzzerPlugin.DURATION_BEFORE_FUZZ, 7 * 24 * 60 * 60 * 1000);
 
     static readonly commandName = 'logfuzzer';
 
@@ -19,7 +20,7 @@ export class LogFuzzerPlugin extends GlobalPlugin {
      */
     protected storage: { lastId: number } = { lastId: 0 };
 
-    private tickTimeout?: any;
+    private tickTimeout?: NodeJS.Timeout;
 
     constructor(manager: RoomManager) {
         super(manager);
diff --git a/app/server/plugins/security_extra/MessageLimiterPlugin.ts b/app/server/plugins/security_extra/MessageLimiterPlugin.ts
new file mode 100644
index 00000000..d86c39c1
--- /dev/null
+++ b/app/server/plugins/security_extra/MessageLimiterPlugin.ts
@@ -0,0 +1,128 @@
+import { RoomPlugin } from '../RoomPlugin';
+import { Room } from '../../skychat/Room';
+import { Connection } from '../../skychat/Connection';
+import { Message } from '../../skychat/Message';
+import { UserController } from '../../skychat/UserController';
+
+export type MessageLimit = {
+    maxSuccessiveChars: number | null;
+};
+
+export class MessageLimiterPlugin extends RoomPlugin {
+    static readonly commandName = 'messagelimiter';
+
+    static readonly errorMessage = 'Message limit exceeded (character limit)';
+
+    readonly opOnly = true;
+
+    readonly rules = {
+        messagelimiter: {
+            minCount: 0,
+            maxCount: 1,
+            params: [
+                {
+                    name: 'maxSuccessiveChars',
+                    pattern: /^\d+$/,
+                },
+            ],
+        },
+    };
+
+    protected storage: MessageLimit = {
+        maxSuccessiveChars: null,
+    };
+
+    constructor(room: Room) {
+        super(room);
+
+        this.loadStorage();
+    }
+
+    public getRoomSummary(): null | number {
+        return this.storage.maxSuccessiveChars;
+    }
+
+    async run(_alias: string, param: string, connection: Connection): Promise<void> {
+        if (this.room.isPrivate) {
+            throw new Error('This command is not available in private rooms');
+        }
+
+        const maxSuccessiveChars = parseInt(param);
+        this.storage.maxSuccessiveChars = isNaN(maxSuccessiveChars) ? null : maxSuccessiveChars;
+        this.syncStorage();
+
+        // Send message to connection
+        const message = new Message({
+            content: 'Message limit: ' + (this.storage.maxSuccessiveChars ?? 'off'),
+            user: UserController.getNeutralUser(),
+        });
+        connection.send('message', message.sanitized());
+    }
+
+    public allowMessageEdit(message: Message, newContent: string): boolean {
+        // No limit in private rooms
+        if (this.room.isPrivate) {
+            return true;
+        }
+
+        // If no limit
+        if (this.storage.maxSuccessiveChars === null) {
+            return true;
+        }
+
+        // Get last successive messages
+        const lastSuccessiveMessages = [];
+        let i = this.room.messages.length - 1;
+        while (i >= 0 && this.room.messages[i].user.id === message.user.id) {
+            lastSuccessiveMessages.push(this.room.messages[i]);
+            i--;
+        }
+
+        // Is the message to edit part of these successive messages?
+        if (!lastSuccessiveMessages.find((m) => m.id === message.id)) {
+            return true;
+        }
+
+        // Get new successive chars
+        let totalChars = 0;
+        for (const lastSuccessiveMessage of lastSuccessiveMessages) {
+            if (lastSuccessiveMessage.id !== message.id) {
+                totalChars += lastSuccessiveMessage.content.length;
+            }
+        }
+
+        // Check if limit is exceeded
+        return totalChars + newContent.length <= this.storage.maxSuccessiveChars;
+    }
+
+    public allowNewMessage(message: Message): boolean {
+        // No limit in private rooms
+        if (this.room.isPrivate) {
+            return true;
+        }
+
+        // If no limit
+        if (this.storage.maxSuccessiveChars === null) {
+            return true;
+        }
+
+        // Get last successive messages
+        let totalChars = 0;
+        let i = this.room.messages.length - 1;
+        while (i >= 0 && this.room.messages[i].user.id === message.user.id) {
+            totalChars += this.room.messages[i].content.length;
+            i--;
+        }
+
+        // Check if limit is exceeded
+        return totalChars + message.content.length <= this.storage.maxSuccessiveChars;
+    }
+
+    public async onBeforeMessageBroadcastHook(message: Message): Promise<Message> {
+        if (!this.allowNewMessage(message)) {
+            throw new Error(MessageLimiterPlugin.errorMessage);
+        }
+
+        return message;
+    }
+}
diff --git a/app/server/plugins/security_extra/RoomProtectPlugin.ts b/app/server/plugins/security_extra/RoomProtectPlugin.ts
new file mode 100644
index 00000000..ebac7045
--- /dev/null
+++ b/app/server/plugins/security_extra/RoomProtectPlugin.ts
@@ -0,0 +1,73 @@
+import { UserController } from '../../skychat/UserController';
+import { RoomPlugin } from '../RoomPlugin';
+import { Room } from '../../skychat/Room';
+import { Connection } from '../../skychat/Connection';
+
+export class RoomProtectPlugin extends RoomPlugin {
+    static readonly commandName = 'roomprotect';
+
+    readonly opOnly = true;
+
+    readonly rules = {
+        roomprotect: {
+            minCount: 1,
+            maxCount: 3,
+            params: [
+                {
+                    name: 'protection',
+                    pattern: /^(off|\d+)$/,
+                },
+            ],
+        },
+    };
+
+    /**
+     * Min right to enter the room
+     */
+    protected storage: null | number = null;
+
+    constructor(room: Room) {
+        super(room);
+
+        this.loadStorage();
+    }
+
+    async run(_alias: string, param: string): Promise<void> {
+        await this.handleRoomProtect(param);
+    }
+
+    public getRoomSummary() {
+        return this.storage;
+    }
+
+    async handleRoomProtect(param: string) {
+        if (param === 'off') {
+            this.storage = null;
+        } else if (!isNaN(parseInt(param, 10))) {
+            this.storage = parseInt(param, 10);
+        }
+        this.syncStorage();
+
+        this.room.sendMessage({
+            content: 'Room as a new protection policy: ' + (this.storage === null ? 'No protection' : `Min right: ${this.storage}`),
+            user: UserController.getNeutralUser(),
+        });
+    }
+
+    public async onBeforeConnectionJoinedRoom(connection: Connection): Promise<void> {
+        // If bunker mode not enabled, do nothing
+        if (this.storage === null) {
+            return;
+        }
+
+        if (connection.session.isOP()) {
+            return;
+        }
+
+        if (connection.session.user.right >= this.storage) {
+            return;
+        }
+
+        throw new Error('You do not have enough right to enter this room');
+    }
+}
diff --git a/app/server/skychat/Config.ts b/app/server/skychat/Config.ts
index 5e7eed23..7b983319 100644
--- a/app/server/skychat/Config.ts
+++ b/app/server/skychat/Config.ts
@@ -2,6 +2,7 @@ import fs from 'fs';
 import * as Mail from 'nodemailer/lib/mailer';
 
 export type Preferences = {
+    minRightForPublicMessages: number;
     minRightForPrivateMessages: number;
     minRightForShortTermMessageHistory: number;
     minRightForMessageHistory: number;
@@ -21,6 +22,7 @@ export type Preferences = {
     maxNewlinesPerMessage: number;
     maxConsecutiveMessages: number;
     maxMessageMergeDelayMin: number;
+    daysBeforeMessageFuzz: number;
     invertedBlacklist: boolean;
     messagesCooldown: Array<[number, number]>;
 };
@@ -165,6 +167,7 @@ export class Config {
             'maxNewlinesPerMessage',
             'maxConsecutiveMessages',
             'maxMessageMergeDelayMin',
+            'daysBeforeMessageFuzz',
             'invertedBlacklist',
             'messagesCooldown',
         ];
diff --git a/app/server/skychat/Room.ts b/app/server/skychat/Room.ts
index eda64ce9..0634b25d 100644
--- a/app/server/skychat/Room.ts
+++ b/app/server/skychat/Room.ts
@@ -3,7 +3,6 @@ import SQL from 'sql-template-strings';
 import { Connection } from './Connection';
 import { IBroadcaster } from './IBroadcaster';
 import { Message, MessageConstructorOptions } from './Message';
-import { Plugin } from '../plugins/Plugin';
 import { DatabaseHelper } from './DatabaseHelper';
 import { MessageController } from './MessageController';
 import { RoomManager } from './RoomManager';
@@ -16,6 +15,7 @@ import { Config } from './Config';
 
 export type StoredRoom = {
     name: string;
+    order: number;
     pluginGroupNames: string[];
     isPrivate: boolean;
     whitelist: string[];
@@ -77,6 +77,11 @@ export class Room implements IBroadcaster {
      */
     public name: string;
 
+    /**
+     * Room order in the list (only for public rooms)
+     */
+    public order: number = 0;
+
     /**
      * List of enabled plugin groups
      */
@@ -196,6 +201,7 @@ export class Room implements IBroadcaster {
         try {
             const data = JSON.parse(fs.readFileSync(this.getStoragePath()).toString()) as StoredRoom;
             this.name = data.name ?? this.name;
+            this.order = data.order ?? this.order;
             this.pluginGroupNames = data.pluginGroupNames ?? this.pluginGroupNames;
             this.isPrivate = !!data.isPrivate;
             this.whitelist = data.whitelist;
@@ -211,6 +217,7 @@ export class Room implements IBroadcaster {
     private save(): boolean {
         const data: StoredRoom = {
             name: this.name,
+            order: this.order,
             pluginGroupNames: this.pluginGroupNames,
             isPrivate: this.isPrivate,
             whitelist: this.whitelist,
@@ -252,12 +259,13 @@ export class Room implements IBroadcaster {
         if (connection.room === this) {
             return;
         }
+        // Check it's possible to enter the new room
+        await this.executeBeforeConnectionJoinedRoom(connection, this);
         // If this connection was attached to another room
         if (connection.room) {
             // Detach from it
             connection.room.detachConnection(connection);
         }
-        await this.executeBeforeConnectionJoinedRoom(connection);
         // Attach the connection to this room
         connection.setRoom(this);
         this.connections.push(connection);
@@ -316,17 +324,17 @@ export class Room implements IBroadcaster {
      * Get a plugin instance by its name
      * @param name
      */
-    public getPlugin(name: string): Plugin | undefined {
-        return this.commands[name];
+    public getPlugin<T extends RoomPlugin>(name: string): T | undefined {
+        return this.commands[name] as T | undefined;
     }
 
     /**
      * Execute before room join hook
      * @param connection
      */
-    public async executeBeforeConnectionJoinedRoom(connection: Connection): Promise<void> {
+    public async executeBeforeConnectionJoinedRoom(connection: Connection, room: Room): Promise<void> {
         for (const plugin of this.plugins) {
-            await plugin.onBeforeConnectionJoinedRoom(connection);
+            await plugin.onBeforeConnectionJoinedRoom(connection, room);
         }
     }
 
@@ -447,7 +455,7 @@ export class Room implements IBroadcaster {
     public sanitized(): SanitizedRoom {
         const lastMessage: Message | null = this.messages.length === 0 ? null : this.messages[this.messages.length - 1];
         // Merge summary data from every plugin
-        const plugins: { [pluginName: string]: string } = {};
+        const plugins: { [pluginName: string]: unknown } = {};
         for (const plugin of this.plugins) {
             const summary = plugin.getRoomSummary();
             if (summary === null || typeof summary === 'undefined') {
diff --git a/app/server/skychat/RoomManager.ts b/app/server/skychat/RoomManager.ts
index 1e4ede3e..d10db21c 100644
--- a/app/server/skychat/RoomManager.ts
+++ b/app/server/skychat/RoomManager.ts
@@ -99,11 +99,18 @@ export class RoomManager {
                 userId: new iof.NumberFilter(1, Infinity, false),
                 timestamp: new iof.NumberFilter(-Infinity, Infinity, false),
                 signature: new iof.ValueTypeFilter('string'),
+                roomId: new iof.NumberFilter(0, Infinity, false),
             }),
         );
 
         // Join a room
-        this.server.registerEvent('join-room', this.onJoinRoom.bind(this), 0, 120, new iof.ObjectFilter({ roomId: new iof.NumberFilter(0, Infinity, false) }));
+        this.server.registerEvent(
+            'join-room',
+            this.onJoinRoom.bind(this),
+            0,
+            120,
+            new iof.ObjectFilter({ roomId: new iof.NumberFilter(0, Infinity, false) }),
+        );
 
         // On message sent
         this.server.registerEvent('message', this.onMessage.bind(this), 0, Infinity, 'string');
@@ -273,6 +280,42 @@ export class RoomManager {
         Object.values(Session.sessions).forEach((session) => this.sendRoomList(session));
     }
 
+    /**
+     * Reorder public rooms
+     */
+    public async reOrderRooms(order: number[]) {
+        const roomIds = order.filter((roomId) => {
+            if (isNaN(roomId)) {
+                throw new Error('Invalid room id');
+            }
+            if (!this.hasRoomId(roomId)) {
+                throw new Error(`Room ${roomId} not found`);
+            }
+            const room = this.getRoomById(roomId);
+            if (!room || room.isPrivate) {
+                throw new Error(`Room ${roomId} is private`);
+            }
+            return true;
+        });
+
+        // Check there are no duplicates
+        if ([...new Set(roomIds)].length !== roomIds.length) {
+            throw new Error('Duplicate room ids');
+        }
+
+        // Set new order
+        for (let i = 0; i < roomIds.length; ++i) {
+            const room = this.getRoomById(roomIds[i]);
+            if (!room) {
+                throw new Error(`Room ${roomIds[i]} not found`);
+            }
+            room.order = roomIds.length - i;
+        }
+
+        // Send room list
+        Object.values(Session.sessions).forEach((session) => this.sendRoomList(session));
+    }
+
     /**
      * Build a new session object when there is a new connection
      */
@@ -312,8 +355,8 @@ export class RoomManager {
                     const getWeight = (room: Room): number => {
                         const privateValue = room.isPrivate ? 0 : 1;
                         const participantCountValue = room.isPrivate ? room.whitelist.length : 1;
-                        const score = [privateValue, participantCountValue, Room.CURRENT_ID - room.id];
-                        return score.reduce((a, b) => a * 1000 + b, 0);
+                        const score = [privateValue, participantCountValue, room.order, Room.CURRENT_ID - room.id];
+                        return score.reduce((a, b) => a * 10000 + b, 0);
                     };
                     return getWeight(b) - getWeight(a);
                 })
@@ -343,6 +386,16 @@ export class RoomManager {
         }
     }
 
+    /**
+     * Execute before register hook
+     * @param connection
+     */
+    public async executeBeforeRegisterHook(payload: unknown, connection: Connection): Promise<void> {
+        for (const plugin of this.plugins) {
+            await plugin.onBeforeRegister(payload, connection);
+        }
+    }
+
     /**
      * Execute connection authenticated hook
      * @param connection
@@ -377,19 +430,20 @@ export class RoomManager {
     }
 
     private async onRegister(payload: any, connection: Connection): Promise<void> {
+        await this.executeBeforeRegisterHook(payload, connection);
         await UserController.registerUser(payload.username, payload.password);
-        await this.onAuthSuccessful(payload.username, connection);
+        await this.onAuthSuccessful(connection, payload.username);
     }
 
     private async onLogin(payload: any, connection: Connection): Promise<void> {
         await UserController.login(payload.username, payload.password);
-        await this.onAuthSuccessful(payload.username, connection);
+        await this.onAuthSuccessful(connection, payload.username);
     }
 
     private async onSetToken(payload: any, connection: Connection): Promise<void> {
         try {
             const user = await UserController.verifyAuthToken(payload);
-            await this.onAuthSuccessful(user.username, connection);
+            await this.onAuthSuccessful(connection, user.username, payload.roomId);
         } catch (e) {
             connection.send('auth-token', null);
         }
@@ -416,7 +470,7 @@ export class RoomManager {
      * @param username
      * @param connection
      */
-    private async onAuthSuccessful(username: string, connection: Connection): Promise<void> {
+    private async onAuthSuccessful(connection: Connection, username: string, roomId?: number): Promise<void> {
         // Find an existing session belonging to the same user
         const recycledSession = Session.getSessionByIdentifier(username.toLowerCase());
         let user;
@@ -436,7 +490,12 @@ export class RoomManager {
         }
         connection.send('auth-token', UserController.getAuthToken(user.id));
         this.sendRoomList(connection);
-        const room = this.rooms.find((room) => !room.isPrivate);
+        // Find a room to join
+        let room;
+        if (typeof roomId === 'number') {
+            room = this.getRoomById(roomId);
+        }
+        room = room ?? this.rooms.find((room) => !room.isPrivate);
         if (room) {
             await room.attachConnection(connection);
             await this.executeConnectionAuthenticatedHook(connection);
diff --git a/app/template/preferences.json.template b/app/template/preferences.json.template
index 04b4bc17..f42bc9e5 100644
--- a/app/template/preferences.json.template
+++ b/app/template/preferences.json.template
@@ -1,5 +1,6 @@
 {
     "minRightForMessageHistory": -1,
+    "minRightForPublicMessages": -1,
     "minRightForPrivateMessages": -1,
     "minRightForUserModeration": "op",
     "minRightForSetRight": "op",
@@ -17,6 +18,7 @@
     "maxNewlinesPerMessage": 20,
     "maxConsecutiveMessages": 1,
     "maxMessageMergeDelayMin": 10,
+    "daysBeforeMessageFuzz": 7,
     "invertedBlacklist": false,
     "messagesCooldown": [
         [-1, 0]
diff --git a/package-lock.json b/package-lock.json
index f2737820..34c09ac3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,7 @@
                 "vue": "^3.2.45",
                 "vue-router": "^4.1.6",
                 "vue-toastification": "^2.0.0-rc.5",
+                "vuedraggable": "^4.1.0",
                 "ws": "^8.13.0"
             },
             "devDependencies": {
@@ -8800,6 +8801,11 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
             "optional": true
         },
+        "node_modules/sortablejs": {
+            "version": "1.14.0",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+            "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+        },
         "node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -9649,6 +9655,17 @@
                 "vue": "^3.0.2"
             }
         },
+        "node_modules/vuedraggable": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+            "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+            "dependencies": {
+                "sortablejs": "1.14.0"
+            },
+            "peerDependencies": {
+                "vue": "^3.0.1"
+            }
+        },
         "node_modules/webidl-conversions": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -15961,6 +15978,11 @@
                 }
             }
         },
+        "sortablejs": {
+            "version": "1.14.0",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+            "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+        },
         "source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -16540,6 +16562,14 @@
             "integrity": "sha512-q73e5jy6gucEO/U+P48hqX+/qyXDozAGmaGgLFm5tXX4wJBcVsnGp4e/iJqlm9xzHETYOilUuwOUje2Qg1JdwA==",
             "requires": {}
         },
+        "vuedraggable": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+            "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+            "requires": {
+                "sortablejs": "1.14.0"
+            }
+        },
         "webidl-conversions": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/package.json b/package.json
index 541f85d0..2dd6a32b 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
         "vue": "^3.2.45",
         "vue-router": "^4.1.6",
         "vue-toastification": "^2.0.0-rc.5",
+        "vuedraggable": "^4.1.0",
         "ws": "^8.13.0"
     },
     "devDependencies": {