diff --git a/README.md b/README.md
index 744c4b7b..645fc254 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,14 @@ When multichannel is enabled, here is what it looks like:
 ![overall-screenshot](./doc/screenshot.png)
 
 
-### Synchronized Youtube / Twitch / Embedded player
+### Synchronized media player
+
+Users can play Youtube, Twitch and self-hosted videos in a shared synchronized players.
+
+The player has two modes:
+- A 'free' mode, selected by default, where any user can add a media. Orchestration is implemented through a public queue of videos to play, and decision-making (for instance to skip videos) is done with polls.
+- A 'schedule' mode, when users with privilege schedule a media to play at a specific time. These medias can not be skipped, and users can view the schedule to see what medias will play in the upcoming days. When the scheduled media finishes, the player goes back in 'free' mode.
 
-Users can play medias from Youtube, Twitch or their local computer in a shared synchronized player. Orchestration is implemented through a public queue of videos to play, and decision-making (for instance to skip videos) is done with polls. Democracy 💯. If you want it, setup multiple video channels to allow concurrent screenings.
 ![youtube-short](./doc/youtube-short.gif)
 
 ### Live cursor visualization and mini-games
@@ -119,15 +124,18 @@ The `config/preferences.json` file specifies application preferences. The availa
 
 | field | type | default | description |
 |-------|------|---------|-------------|
-| minRightForPrivateMessages    | number |  -1 | Min. right to send private messages |
-| minRightForMessageHistory     | number |  -1 | Min. right to access room message history |
-| minRightForAudioRecording     | number |  -1 | Min. right to share and play audio recordings |
-| minRightForConnectedList      | number |  -1 | Min. right to access the list of currently active users |
-| minRightForPolls              | number |  -1 | Min. right to create polls |
-| minRightForGallery            | number |  -1 | Min. right to access the gallery |
-| maxReplacedImagesPerMessage   | number |  50 | Max. number of replaced images per message |
-| maxReplacedStickersPerMessage | number |  50 | Max. number of replaced stickers per message |
-| maxNewlinesPerMessage         | number |  20 | Max. number of newlines per message |
+| minRightForPrivateMessages      | number |  -1 | Min. right to send private messages |
+| minRightForMessageHistory       | number |  -1 | Min. right to access room message history |
+| minRightForAudioRecording       | number |  -1 | Min. right to share and play audio recordings |
+| minRightForConnectedList        | number |  -1 | Min. right to access the list of currently active users |
+| minRightForPolls                | number |  -1 | Min. right to create polls |
+| minRightForGalleryRead          | number \| 'op' |  'op' | Min. right to access the gallery |
+| minRightForGalleryWrite         | number \| 'op' |  'op' | Min. right to add and remove gallery documents |
+| minRightForPlayerAddMedia       | number \| 'op' |  'op' | Min. right to add medias to the player |
+| minRightForPlayerManageSchedule | number \| 'op' |  'op' | Min. right to manage the player schedules |
+| maxReplacedImagesPerMessage     | number |  50 | Max. number of replaced images per message |
+| maxReplacedStickersPerMessage   | number |  50 | Max. number of replaced stickers per message |
+| maxNewlinesPerMessage           | number |  20 | Max. number of newlines per message |
 
 
 ### Customize plugins
diff --git a/app/client/css/styles.scss b/app/client/css/styles.scss
index 436ecfeb..20839992 100644
--- a/app/client/css/styles.scss
+++ b/app/client/css/styles.scss
@@ -78,7 +78,9 @@ body {
     }
 }
 
-.scrollbar {
+.scrollbar,
+.tui-full-calendar-timegrid-container,
+.tui-full-calendar-dayname-container {
 
     /** Firefox */
     scrollbar-color: #555 #343434;
diff --git a/app/client/src/SkyChatClient.js b/app/client/src/SkyChatClient.js
index 59b036d5..478f84a0 100644
--- a/app/client/src/SkyChatClient.js
+++ b/app/client/src/SkyChatClient.js
@@ -346,7 +346,7 @@ export class SkyChatClient extends EventEmitter {
      */
     onMessage(message) {
         this.store.commit('Main/NEW_MESSAGE', message);
-        if (this.store.state.Main.user.right >= 0 && this.store.state.focused) {
+        if (this.store.state.Main.user.right >= 0 && this.store.state.Main.focused) {
             this.notifySeenMessage(message.id);
         }
     }
@@ -357,7 +357,7 @@ export class SkyChatClient extends EventEmitter {
      */
     onMessages(messages) {
         this.store.commit('Main/NEW_MESSAGES', messages);
-        if (this.store.state.Main.user.right >= 0 && this.store.state.focused && messages.length > 0) {
+        if (this.store.state.Main.user.right >= 0 && this.store.state.Main.focused && messages.length > 0) {
             this.notifySeenMessage(messages[messages.length - 1].id);
         }
     }
@@ -388,10 +388,10 @@ export class SkyChatClient extends EventEmitter {
 
     /**
      *
-     * @param data
+     * @param messageSeen
      */
-    onMessageSeen(data) {
-        this.store.commit('Main/MESSAGE_SEEN', data);
+    onMessageSeen(messageSeen) {
+        this.store.dispatch('Main/messageSeen', messageSeen);
     }
 
     /**
@@ -412,10 +412,10 @@ export class SkyChatClient extends EventEmitter {
 
     /**
      *
-     * @param users
+     * @param connectedList
      */
-    onConnectedList(users) {
-        this.store.commit('Main/SET_CONNECTED_LIST', users);
+    onConnectedList(connectedList) {
+        this.store.dispatch('Main/setConnectedList', connectedList);
     }
 
     /**
diff --git a/app/client/src/index.js b/app/client/src/index.js
index 0c34b5be..7edee4d7 100644
--- a/app/client/src/index.js
+++ b/app/client/src/index.js
@@ -61,15 +61,15 @@ window.addEventListener('blur', () => {
 });
 
 window.addEventListener('focus', () => {
-    if (store.state.lastMissedMessage) {
-        client.notifySeenMessage(store.state.lastMissedMessage.id);
+    if (store.state.Main.lastMissedMessage) {
+        client.notifySeenMessage(store.state.Main.lastMissedMessage.id);
     }
     store.commit('Main/FOCUS');
 });
 setInterval(() => {
 
     // In case the title is not currently blinking, just update it
-    if (! store.state.documentTitleBlinking) {
+    if (! store.state.Main.documentTitleBlinking) {
         if (document.title !== store.state.Main.documentTitle) {
             document.title = store.state.Main.documentTitle;
         }
@@ -79,6 +79,6 @@ setInterval(() => {
     const chars = "┤┘┴└├┌┬┐";
     const indexOf = chars.indexOf(document.title[0]);
     const newPosition = (indexOf + 1) % chars.length;
-    document.title = chars[newPosition] + ' ' + store.state.documentTitle;
+    document.title = chars[newPosition] + ' ' + store.state.Main.documentTitle;
 
 }, 1000);
diff --git a/app/client/src/vue/components/channel/PlayerChannelList.vue b/app/client/src/vue/components/channel/PlayerChannelList.vue
index 67bccba4..907c4a45 100644
--- a/app/client/src/vue/components/channel/PlayerChannelList.vue
+++ b/app/client/src/vue/components/channel/PlayerChannelList.vue
@@ -9,7 +9,8 @@
         
         <hover-card v-for="channel in playerChannels"
             :key="channel.id"
-            :selected="playerChannel === channel.id"
+            :clickable="true"
+            :selected="playerChannelId === channel.id"
             :border-color="'rgb(255, 130, 130)'"
             class="channel"
             @click.native="joinChannel(channel.id)"
@@ -21,37 +22,39 @@
                     </div>
                     <div class="channel-meta">
                         <!-- delete channel (op) -->
-                        <div v-show="playerChannel === channel.id && op"
+                        <div v-show="playerChannelId === channel.id && op"
                             @click="deleteChannel()"
-                            class="channel-delete mr-1"
+                            class="channel-delete"
                             title="Delete this channel">
                             <i class="material-icons md-14">close</i>
                         </div>
-                        <!-- show if there is a video currently playing -->
-                        <div v-show="channel.playing"
-                            class="channel-player mr-1"
-                            :class="{ 'disabled': playerChannel !== channel.id }"
-                            title="A video is currently playing">
-                            <div class="channel-player-owner">{{channel.currentOwner}}</div>
-                            <i class="material-icons md-14">movie</i>
+                        <!-- users in the channel -->
+                        <div v-for="user of (playerChannelUsers[channel.id] || []).slice(0, 4)"
+                            :key="user.username"
+                            class="avatar image-bubble"
+                            :title="user.username + ' is watching'"
+                            :style="{'border': '1px solid ' + user.data.plugins.color}">
+                            <img :src="user.data.plugins.avatar">
+                        </div>
+                        <!-- represents other users -->
+                        <div v-if="(playerChannelUsers[channel.id] || []).length > 4"
+                            :title="(playerChannelUsers[channel.id].length - 4) + 'others are watching'"
+                            class="avatar"
+                        >
+                            <i class="material-icons md-14">more_horiz</i>
                         </div>
                     </div>
                 </div>
-                <div class="channel-content-users" v-if="playerChannelUsers[channel.id] && playerChannelUsers[channel.id].length > 0">
-                    <!-- users in the channel -->
-                    <div v-for="user of playerChannelUsers[channel.id]"
-                        :key="user.username"
-                        class="avatar image-bubble"
-                        :title="user.username + ' is watching'"
-                        :style="{'border': '1px solid ' + user.data.plugins.color}">
-                        <img :src="user.data.plugins.avatar">
-                    </div>
-                    <!-- connected users -->
-                    <div v-if="playerChannelUsers[channel.id] && playerChannelUsers[channel.id].length > 0"
-                        class="channel-users mr-1"
-                        title="Number of watchers">
-                        <i class="material-icons md-14">{{playerChannelUsers[channel.id].length > 1 ? 'group' : 'person'}}</i>
-                        <span>{{ playerChannelUsers[channel.id].length }}</span>
+                <div v-if="channel.currentMedia"
+                    class="channel-content-detail">
+                    <!-- show if there is a video currently playing -->
+                    <div v-show="channel.playing"
+                        class="channel-player"
+                        :class="{ 'disabled': playerChannelId !== channel.id }"
+                        :title="'Media added by ' + channel.currentMedia.owner">
+
+                        <div class="channel-player-owner">{{ channel.currentMedia.title }}</div>
+                        <i class="material-icons md-14">movie</i>
                     </div>
                 </div>
             </div>
@@ -69,7 +72,7 @@
         props: { },
         methods: {
             joinChannel: function(id) {
-                if (this.playerChannel === id) {
+                if (this.playerChannelId === id) {
                     this.$client.leavePlayerChannel();
                 } else {
                     this.$client.joinPlayerChannel(id);
@@ -86,7 +89,7 @@
             ...mapState('Main', [
                 'playerChannelUsers',
                 'playerChannels',
-                'playerChannel',
+                'playerChannelId',
                 'user',
                 'op',
             ]),
@@ -120,7 +123,7 @@
 
     .channel {
         min-height: 35px;
-        margin-top: 4px;
+        margin-top: 2px;
 
         .channel-content {
             display: flex;
@@ -128,6 +131,8 @@
 
             .channel-content-info {
                 display: flex;
+                height: 35px;
+                flex-basis: 35px;
 
                 .channel-icon {
                     flex-basis: 20px;
@@ -138,67 +143,69 @@
 
                 .channel-name {
                     flex-grow: 1;
-                    margin-top: 10px;
                     margin-left: 2px;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
-                    height: 20px;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
                 }
 
                 .channel-meta {
-                    flex-basis: 100px;
+                    flex-basis: 105px;
                     margin-top: 10px;
+                    padding-right: 10px;
                     display: flex;
                     flex-direction: row-reverse;
+                    flex-wrap: nowrap;
+                    overflow: hidden;
 
-                    .channel-player {
-                        color: #ff8f8f;
-
-                        .channel-player-owner {
-                            vertical-align: top;
-                            font-size: 11px;
-                            max-width: 70px;
-                            overflow: hidden;
-                            display: inline-block;
-                            text-overflow: ellipsis;
-                        }
-                    }
-
-                    .channel-player.disabled {
-                        color: #8c8c8c;
+                    >.avatar {
+                        min-width: 15px;
+                        width: 15px;
+                        height: 15px;
+                        margin-right: 4px;
                     }
-                    
+                
                     .channel-delete {
                         color: #ff8e8e;
+                        margin-right: 3px;
                     }
                 }
             }
-            .channel-content-users {
+            .channel-content-detail {
                 display: flex;
                 overflow: hidden;
                 justify-content: flex-end;
                 margin-bottom: 5px;
-                margin-left: 12px;
+                padding-right: 14px;
+                padding-left: 10px;
+                
+                .channel-player {
+                    color: #ff8f8f;
+                    flex-grow: 1;
+                    width: 0;
+                    display: flex;
 
-                .channel-users {
-                    color: #8ecfff;
-                    margin-top: 3px;
-                    margin-left: 6px;
-                    white-space: nowrap;
-                    text-align: right;
-                    span { vertical-align: top; }
+                    .channel-player-owner {
+                        vertical-align: top;
+                        font-size: 11px;
+                        flex-grow: 1;
+                        padding-right: 10px;
+                        overflow: hidden;
+                        display: inline-block;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                    }
                 }
 
-                >.avatar {
-                    min-width: 20px;
-                    width: 20px;
-                    height: 20px;
-                    margin: 1px;
+                .channel-player.disabled {
+                    color: #8c8c8c;
                 }
             }
         }
     }
 }
 
-</style>
+</style>
\ No newline at end of file
diff --git a/app/client/src/vue/components/channel/TextChannelList.vue b/app/client/src/vue/components/channel/TextChannelList.vue
index 09cb331d..9bd81445 100644
--- a/app/client/src/vue/components/channel/TextChannelList.vue
+++ b/app/client/src/vue/components/channel/TextChannelList.vue
@@ -8,6 +8,7 @@
         </div>
         <hover-card v-for="room in rooms"
             :key="room.id"
+            :clickable="true"
             :selected="currentRoom === room.id"
             :highlighted="user.id > 0 && (user.data.plugins.lastseen[room.id] || 0) < room.lastReceivedMessageId && currentRoom !== room.id"
             :border-color="'#afafaf'"
@@ -132,7 +133,7 @@
     .room {
         
         height: 35px;
-        margin-top: 4px;
+        margin-top: 2px;
         
         .room-content {
             display: flex;
diff --git a/app/client/src/vue/components/form/MessageForm.vue b/app/client/src/vue/components/form/MessageForm.vue
index 07fcdb55..d38df9a0 100644
--- a/app/client/src/vue/components/form/MessageForm.vue
+++ b/app/client/src/vue/components/form/MessageForm.vue
@@ -39,6 +39,9 @@
         <div v-show="gallery" class="form-action open-gallery" @click="openGallery" title="Access gallery">
             <i class="material-icons md-28">collections</i>
         </div>
+        <div class="form-action open-player-schedule" @click="openPlayerSchedule" title="See player schedule">
+            <i class="material-icons md-28">event</i>
+        </div>
         <div class="show-mobile">
             <div class="goto-other-cols">
                 <div @click="onMobileShowRightCol" title="See connected list and quick actions" class="goto-right-col">
@@ -53,6 +56,7 @@
     import Vue from "vue";
     import { mapState } from 'vuex';
     import GalleryModal from "../modal/GalleryModal.vue";
+    import PlayerSchedule from "../modal/PlayerSchedule.vue";
 
     const MESSAGE_HISTORY_LENGTH = 100;
 
@@ -114,6 +118,10 @@
                 this.$modal.show(GalleryModal);
             },
 
+            openPlayerSchedule: function() {
+                this.$modal.show(PlayerSchedule);
+            },
+
             uploadAudio: async function() {
                 if (this.recordingAudio) {
                     // Stop recording
@@ -322,7 +330,12 @@
 
         .open-gallery {
             margin-bottom: 12px;
-            margin-right: 20px;
+            margin-right: 10px;
+        }
+
+        .open-player-schedule {
+            margin-bottom: 12px;
+            margin-right: 10px;
         }
 
         .goto-left-col,
diff --git a/app/client/src/vue/components/gallery/GalleryPreview.vue b/app/client/src/vue/components/gallery/GalleryPreview.vue
index b454c855..4a9afce4 100644
--- a/app/client/src/vue/components/gallery/GalleryPreview.vue
+++ b/app/client/src/vue/components/gallery/GalleryPreview.vue
@@ -17,46 +17,45 @@
 
                 <!-- 1 folder -->
                 <div v-for="folder in shownFolders"
-                    :key="folder.id">
+                    :key="folder.id"
+                    class="gallery-folder">
 
                     <h3 class="section-title">
                         <span :title="'#' + folder.id + ': ' + folder.name">{{folder.name}}</span>
-                        <span v-show="folder.medias.length === 0 && op" @click="deleteFolder(folder.id)" title="Delete this folder" class="folder-delete material-icons md-14">close</span>
+                        <span v-show="folder.medias.length === 0 && canWrite()" @click="deleteFolder(folder.id)" title="Delete this folder" class="folder-delete material-icons md-14">close</span>
                     </h3>
 
                     <!-- medias -->
-                    <div class="media-list">
-                        <div class="media-list-thumbs">
-                            <!-- 1 media -->
-                            <div
-                                v-for="media in folder.medias"
-                                :key="media.id"
-                                :style="{'background-image': 'url(' + media.thumb + ')'}"
-                                @click="openMedia(media)"
-                                class="media">
-                                <div class="media-title" :title="media.tags.join(', ')">
-                                    <div v-for="tag in media.tags"
-                                        :key="tag"
-                                        class="media-tag">
-                                        {{ tag }}
-                                    </div>
+                    <div class="media-list scrollbar">
+                        <!-- 1 media -->
+                        <div
+                            v-for="media in folder.medias"
+                            :key="media.id"
+                            :style="{'background-image': 'url(' + media.thumb + ')'}"
+                            @click="openMedia(media)"
+                            class="media">
+                            <div class="media-title" :title="media.tags.join(', ')">
+                                <div v-for="tag in media.tags"
+                                    :key="tag"
+                                    class="media-tag">
+                                    {{ tag }}
                                 </div>
-                                <div class="media-extension">
-                                    .{{ media.location.match(/\.([a-z0-9]+)$/)[1] }}
+                            </div>
+                            <div class="media-extension">
+                                .{{ media.location.match(/\.([a-z0-9]+)$/)[1] }}
+                            </div>
+                            <div class="media-actions">
+                                <!-- copy -->
+                                <div class="media-action" title="Copy link to clipboard" @click.stop="copyMediaLink(media)">
+                                    <i class="material-icons md-14">content_copy</i>
+                                </div>
+                                <!-- play (if video) -->
+                                <div v-show="isPlayable(media)" class="media-action" title="Play media" @click.stop="playMedia(media)">
+                                    <i class="material-icons md-14">play_arrow</i>
                                 </div>
-                                <div class="media-actions">
-                                    <!-- copy -->
-                                    <div class="media-action" title="Copy link to clipboard" @click.stop="copyMediaLink(media)">
-                                        <i class="material-icons md-14">content_copy</i>
-                                    </div>
-                                    <!-- play (if video) -->
-                                    <div v-show="isPlayable(media)" class="media-action" title="Play media" @click.stop="playMedia(media)">
-                                        <i class="material-icons md-14">play_arrow</i>
-                                    </div>
-                                    <!-- delete -->
-                                    <div v-show="op" class="media-action" title="Delete" @click.stop="deleteMedia(media)">
-                                        <i class="material-icons md-14">close</i>
-                                    </div>
+                                <!-- delete -->
+                                <div v-show="canWrite()" class="media-action" title="Delete" @click.stop="deleteMedia(media)">
+                                    <i class="material-icons md-14">close</i>
                                 </div>
                             </div>
                         </div>
@@ -90,7 +89,7 @@
         watch: {
             'tab': function() {
                 if (this.tab === 'preview') {
-                    this.shownFolders = this.gallery.folders;
+                    this.shownFolders = this.gallery.data.folders;
                 } else {
                     this.shownFolders = this.gallerySearchResults.folders;
                 }
@@ -109,7 +108,7 @@
                     if (this.tab !== 'preview') {
                         return;
                     }
-                    this.shownFolders = this.gallery.folders;
+                    this.shownFolders = this.gallery.data.folders;
                 }
             },
             'gallerySearchResults': {
@@ -124,7 +123,7 @@
         },
         mounted: function() {
             if (this.gallery) {
-                this.shownFolders = this.gallery.folders;
+                this.shownFolders = this.gallery.data.folders;
             }
         },
         methods: {
@@ -157,7 +156,10 @@
             },
             deleteFolder: function(folderId) {
                 this.$client.sendMessage(`/galleryfolderremove ${folderId}`);
-            }
+            },
+            canWrite: function() {
+                return this.gallery && this.gallery.canWrite;
+            },
         },
         computed: {
             ...mapState('Main', [
@@ -173,15 +175,17 @@
 
     .gallery-preview {
         width: 100%;
+        height: 100%;
         display: flex;
         flex-direction: column;
-        padding-left: 6px;
         color: white;
-        margin-bottom: 6px;
-        margin-top: 10px;
-        padding-right: 20px;
+        padding-bottom: 10px;
+        padding-top: 10px;
+        padding-left: 6px;
+        padding-right: 6px;
 
         .gallery-content {
+            height: 100%;
             background-color: #242427;
             overflow: hidden;
             display: flex;
@@ -210,40 +214,48 @@
             .gallery-results {
                 flex-grow: 1;
                 overflow-y: auto;
+                display: flex;
+                flex-direction: column;
 
-                .section-title {
-                    color: grey;
-                    margin-left: 8px;
-                    margin-top: 8px;
-                    text-align: center;
-
-                    .folder-delete {
-                        cursor: pointer;
-                        color: #ff8e8e;
-                    }
-                }
-
-                .media-list {
+                .gallery-folder {
                     display: flex;
-                    margin-top: 4px;
-                    height: 110px;
+                    flex-direction: column;
+
+                    .section-title {
+                        color: grey;
+                        margin-left: 8px;
+                        margin-top: 8px;
+                        text-align: center;
+                        flex-basis: 22px;
 
-                    .media-list-arrow {
-                        flex-basis: 20px;
+                        .folder-delete {
+                            cursor: pointer;
+                            color: #ff8e8e;
+                        }
                     }
 
-                    .media-list-thumbs {
+                    .media-list {
+                        display: flex;
+                        margin-top: 4px;
+                        max-height: 320px;
+                        margin-bottom: 20px;
                         margin-left: 20px;
                         margin-right: 20px;
-                        display: flex;
-                        overflow: hidden;
+                        padding-bottom: 10px;
+                        max-width: 100%;
+                        flex-wrap: nowrap;
+                        overflow-y: auto;
+
+                        .media-list-arrow {
+                            flex-basis: 20px;
+                        }
 
                         .media {
                             margin-left: 6px;
                             margin-right: 6px;
-                            flex-basis: 110px;
-                            min-width: 110px;
-                            height: 110px;
+                            flex-basis: 120px;
+                            min-width: 120px;
+                            height: 160px;
                             background-position: 50%;
                             background-size: cover;
                             position: relative;
diff --git a/app/client/src/vue/components/layout/TchatMiddleColumn.vue b/app/client/src/vue/components/layout/TchatMiddleColumn.vue
index e5562548..ca41eabc 100644
--- a/app/client/src/vue/components/layout/TchatMiddleColumn.vue
+++ b/app/client/src/vue/components/layout/TchatMiddleColumn.vue
@@ -58,7 +58,6 @@
 </script>
 
 <style lang="scss" scoped>
-
     .messages {
         flex-grow: 1;
         display: flex;
@@ -69,15 +68,5 @@
             height: 40%;
             max-height: 350px;
         }
-
-        .messages-feed {
-            flex-grow: 1;
-            margin-left: 10px;
-            margin-right: 10px;
-            height: 0;
-            overflow-y: scroll;
-            display: flex;
-            flex-direction: column;
-        }
     }
 </style>
diff --git a/app/client/src/vue/components/message/MessageList.vue b/app/client/src/vue/components/message/MessageList.vue
index 8a95d492..07948b3c 100644
--- a/app/client/src/vue/components/message/MessageList.vue
+++ b/app/client/src/vue/components/message/MessageList.vue
@@ -3,14 +3,13 @@
             ref="scroller"
             @scroll="onScroll"
             :style="smoothScroll ? 'scroll-behavior: smooth' : ''">
-            
+        
         <single-message v-for="item in messages"
             @select="$emit('select-message', item)"
             @content-loaded="onContentLoaded"
             :key="item.id"
             :message="item"
-            :seen-users="lastMessageSeenIds[item.id] || []"
-            class="message"/>
+            :seen-users="lastMessageSeenIds[item.id] || []"></single-message>
     </div>
 </template>
 
@@ -21,7 +20,7 @@
     import VideoPlayer from "../video-player/VideoPlayer.vue";
 
     export default Vue.extend({
-        components: {VideoPlayer, SingleMessage},
+        components: { VideoPlayer, SingleMessage },
         data: function() {
             return {
                 autoScroll: true,
diff --git a/app/client/src/vue/components/message/SingleMessage.vue b/app/client/src/vue/components/message/SingleMessage.vue
index 98018f7a..afd26b16 100644
--- a/app/client/src/vue/components/message/SingleMessage.vue
+++ b/app/client/src/vue/components/message/SingleMessage.vue
@@ -1,49 +1,56 @@
 <template>
-    <div @contextmenu.prevent="$emit('select')" class="message" :style="{'border-left-color': message.user.data.plugins.color}">
-        <div class="avatar image-bubble" :style="{'box-shadow': message.user.data.plugins.halo ? '0 0 4px 4px ' + message.user.data.plugins.color : 'unset'}">
-            <img :src="message.user.data.plugins.avatar">
-        </div>
-        <div class="content selectable" ref="formatted">
-            <div class="user" :style="{'color': message.user.data.plugins.color}">
-                <i v-show="message.user.data.plugins.pinnedicon" class="material-icons md-14">{{message.user.data.plugins.pinnedicon}}</i>
-                 {{message.user.username}}
-                <i v-show="message.meta.device === 'mobile'" class="material-icons user-device md-14">smartphone</i>
+    <hover-card
+        :border-color="message.user.data.plugins.color"
+        class="message-card"
+    >
+        <div class="message"
+            @contextmenu.prevent="$emit('select')">
+            <div class="avatar image-bubble" :style="{'box-shadow': message.user.data.plugins.halo ? '0 0 4px 4px ' + message.user.data.plugins.color : 'unset'}">
+                <img :src="message.user.data.plugins.avatar">
             </div>
+            <div class="content selectable" ref="formatted">
+                <div class="user" :style="{'color': message.user.data.plugins.color}">
+                    <i v-show="message.user.data.plugins.pinnedicon" class="material-icons md-14">{{message.user.data.plugins.pinnedicon}}</i>
+                    {{message.user.username}}
+                    <i v-show="message.meta.device === 'mobile'" class="material-icons user-device md-14">smartphone</i>
+                </div>
 
-            <!-- first quote -->
-            <div class="quote" v-if="message.quoted">
-                <div class="quote-user">{{message.quoted.user.username}}:</div>
-                <!-- second quote -->
-                <div class="quote" v-if="message.quoted.quoted">
-                    <div class="quote-user">{{message.quoted.quoted.user.username}}:</div>
-                    <div class="quote-content" v-html="message.quoted.quoted.formatted"></div>
+                <!-- first quote -->
+                <div class="quote" v-if="message.quoted">
+                    <div class="quote-user">{{message.quoted.user.username}}:</div>
+                    <!-- second quote -->
+                    <div class="quote" v-if="message.quoted.quoted">
+                        <div class="quote-user">{{message.quoted.quoted.user.username}}:</div>
+                        <div class="quote-content" v-html="message.quoted.quoted.formatted"></div>
+                    </div>
+                    <div class="quote-content" v-html="message.quoted.formatted"></div>
                 </div>
-                <div class="quote-content" v-html="message.quoted.formatted"></div>
-            </div>
-            <div class="formatted" v-html="message.formatted"></div>
-        </div>
-        <div class="meta selectable">
-            <div class="date">
-                {{formattedDate}}
+                <div class="formatted" v-html="message.formatted"></div>
             </div>
-            <div class="seen-users">
-                <div v-for="seenUser of seenUsers"
-                    :key="seenUser.username"
-                    class="avatar image-bubble"
-                    :title="'Seen by ' + seenUser.username"
-                    :style="{'border': '1px solid ' + seenUser.data.plugins.color}">
-                    <img :src="seenUser.data.plugins.avatar">
+            <div class="meta selectable">
+                <div class="date">
+                    {{formattedDate}}
+                </div>
+                <div class="seen-users">
+                    <div v-for="seenUser of seenUsers"
+                        :key="seenUser.username"
+                        class="avatar image-bubble"
+                        :title="'Seen by ' + seenUser.username"
+                        :style="{'border': '1px solid ' + seenUser.data.plugins.color}">
+                        <img :src="seenUser.data.plugins.avatar">
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    </hover-card>
 </template>
 
 <script>
     import Vue from "vue";
-    import { mapState } from 'vuex';
+    import HoverCard from "../util/HoverCard.vue";
     
     export default Vue.extend({
+        components: { HoverCard },
         props: {
             message: {
                 type: Object,
@@ -99,80 +106,79 @@
 
 <style lang="scss" scoped>
 
-    .message {
-        display: flex;
-        flex: 0 0 auto;
-        color: white;
-        background: #242427;
-        margin-top: 4px;
-        border-left: 4px solid #a3a5b4;
-        padding: 6px 10px 6px 12px;
-        -webkit-transition: all 0.2s;
-        -moz-transition: all 0.2s;
-        -ms-transition: all 0.2s;
-        -o-transition: all 0.2s;
-        transition: all 0.2s;
-        transition-property: border-width, margin-left;
+    .message-card {
+        margin-top: 2px;
 
-        &:hover {
-            border-width: 0;
-            margin-left: 4px;
+        &:hover .message {
             background: #313235;
         }
-
-        >.avatar {
-            width: 40px;
-            height: 40px;
-            box-shadow: 1px 1px 10px 0px #ffffff78;
-        }
-
-        >.content {
-            flex-grow: 1;
-            margin-left: 16px;
-            width: 0;
-            word-break: break-word;
+        
+        .message {
+            background: #242427;
             display: flex;
-            flex-direction: column;
+            flex: 0 0 auto;
+            color: white;
+            padding: 6px 10px 6px 12px;
+            transition: .1s all;
+            min-height: 60px;
 
-            >.user {
-                display: inline;
-                color: #a3a5b4;
-                font-weight: 800;
-                font-size: 110%;
-                margin-bottom: 4px;
+            >.avatar {
+                width: 40px;
+                height: 40px;
+                margin-top: 4px;
+                box-shadow: 1px 1px 10px 0px #ffffff78;
             }
 
-            .quote {
-                margin: 10px;
-                padding: 4px 10px;
-                border-left: 5px solid grey;
+            >.content {
+                flex-grow: 1;
+                margin-left: 16px;
+                width: 0;
+                word-break: break-word;
+                display: flex;
+                flex-direction: column;
 
-                >.quote-user {
-                    font-size: 80%;
+                >.user {
+                    display: inline;
+                    color: #a3a5b4;
+                    font-weight: 800;
+                    font-size: 110%;
+                    margin-bottom: 4px;
                 }
-                >.quote-content {
-                    margin-top: 5px;
-                    margin-left: 4px;
+
+                .quote {
+                    margin: 10px;
+                    padding: 4px 10px;
+                    border-left: 5px solid grey;
+
+                    >.quote-user {
+                        font-size: 80%;
+                    }
+                    >.quote-content {
+                        margin-top: 5px;
+                        margin-left: 4px;
+                    }
                 }
             }
-        }
-        >.meta {
-            font-size: 70%;
-            display: flex;
-            flex-direction: column;
-            width: 66px;
-            text-align: center;
-
-            >.seen-users {
+            >.meta {
+                font-size: 70%;
                 display: flex;
-                flex-wrap: wrap;
-                margin-top: 6px;
-                justify-content: center;
+                flex-direction: column;
+                width: 66px;
+                text-align: center;
+
+                >.seen-users {
+                    display: flex;
+                    flex-wrap: wrap;
+                    margin-top: 6px;
+                    justify-content: center;
+                    max-height: 32px;
+                    overflow: hidden;
 
-                >.avatar {
-                    width: 14px;
-                    height: 14px;
-                    margin: 1px;
+                    >.avatar {
+                        width: 14px;
+                        height: 14px;
+                        margin: 1px;
+                    }
                 }
             }
         }
diff --git a/app/client/src/vue/components/modal/FileManager.vue b/app/client/src/vue/components/modal/FileManager.vue
index c221aa35..e34439ac 100644
--- a/app/client/src/vue/components/modal/FileManager.vue
+++ b/app/client/src/vue/components/modal/FileManager.vue
@@ -5,6 +5,7 @@
                 v-for="filePath in files"
                 :key="filePath"
                 :border-color="'#afafaf'"
+                :clickable="true"
                 :selected="file && file.filePath === filePath"
                 class="file-card"
                 @click.native="loadFile(filePath)"
diff --git a/app/client/src/vue/components/modal/GalleryModal.vue b/app/client/src/vue/components/modal/GalleryModal.vue
index b3412e54..acd36afd 100644
--- a/app/client/src/vue/components/modal/GalleryModal.vue
+++ b/app/client/src/vue/components/modal/GalleryModal.vue
@@ -1,7 +1,5 @@
 <template>
-    <div>
-        <gallery-preview></gallery-preview>
-    </div>
+    <gallery-preview></gallery-preview>
 </template>
 
 <script>
diff --git a/app/client/src/vue/components/modal/PlayerSchedule.vue b/app/client/src/vue/components/modal/PlayerSchedule.vue
new file mode 100644
index 00000000..ea25ea9b
--- /dev/null
+++ b/app/client/src/vue/components/modal/PlayerSchedule.vue
@@ -0,0 +1,182 @@
+<template>
+    <div class="calendar-container">
+
+        <!-- State buttons -->
+        <button @click="view = view === 'week' ? 'month' : 'week'">
+            Show {{ view === 'week' ? 'month' : 'week' }} view
+        </button>
+
+        <!-- Calendar -->
+        <calendar
+            class="tui-calendar"
+            ref="calendar"
+            :view="view"
+            :calendars="calendars"
+            :schedules="schedules"
+            :task-view="false"
+            :schedule-view="['time']"
+            :week="{ startDayOfWeek: 0, }"
+            :month="{ startDayOfWeek: 0, }"
+            :is-read-only="true"
+            :usage-statistics="false"
+            :theme="theme"
+        ></calendar>
+    </div>
+</template>
+
+<script>
+    import Vue from "vue";
+    import { mapState } from 'vuex';
+    import 'tui-calendar/dist/tui-calendar.css';
+    import { Calendar } from '@toast-ui/vue-calendar';
+
+    export default Vue.extend({
+
+        components: { Calendar },
+        
+        data: function() {
+            return {
+                calendars: [],
+                schedules: [],
+                view: 'week',
+                theme: {
+                    'common.border': '1px solid #444', // edited
+                    'common.backgroundColor': '#242427', // edited
+                    'common.holiday.color': 'white', // edited
+                    'common.saturday.color': 'white', // edited
+                    'common.dayname.color': 'white', // edited
+                    'common.today.color': 'white', // edited
+
+                    // month header 'dayname'
+                    'month.dayname.borderLeft': '1px solid #444', // edited
+
+                    // month day grid cell 'day'
+                    'month.holidayExceptThisMonth.color': 'rgba(255, 64, 64, 0.4)',
+                    'month.dayExceptThisMonth.color': 'rgba(51, 51, 51, 0.4)',
+                    'month.weekend.backgroundColor': 'inherit',
+
+                    // month more view
+                    'month.moreView.border': '1px solid #d5d5d5',
+                    'month.moreView.boxShadow': '0 2px 6px 0 rgba(0, 0, 0, 0.1)',
+                    'month.moreView.backgroundColor': 'inherit',
+                    'month.moreViewTitle.backgroundColor': 'inherit',
+                    'month.moreViewTitle.borderBottom': 'none',
+
+                    // week header 'dayname'
+                    'week.dayname.borderTop': '1px solid #444', // edited
+                    'week.dayname.borderBottom': '1px solid #444', // edited
+                    'week.dayname.borderLeft': 'inherit',
+                    'week.dayname.backgroundColor': 'inherit',
+                    'week.today.color': 'white', // edited
+                    'week.pastDay.color': '#999', // edited
+
+                    // week vertical panel 'vpanel'
+                    'week.vpanelSplitter.border': '1px solid #444', // edited
+
+                    // week daygrid 'daygrid'
+                    'week.daygrid.borderRight': 'none', // edited
+                    'week.daygrid.backgroundColor': 'inherit',
+
+                    'week.daygridLeft.backgroundColor': 'inherit',
+                    'week.daygridLeft.borderRight': 'none', // edited
+
+                    'week.today.backgroundColor': 'rgba(81, 92, 230, 0.05)',
+                    'week.weekend.backgroundColor': 'inherit',
+
+                    // week timegrid 'timegrid'
+                    'week.timegridLeft.width': '72px',
+                    'week.timegridLeft.backgroundColor': '#242427', // edited
+                    'week.timegridLeft.borderRight': 'none', // edited
+                    'week.timegridLeft.fontSize': '11px',
+                    'week.timegridLeftTimezoneLabel.height': '40px',
+                    'week.timegridLeftAdditionalTimezone.backgroundColor': 'white', // edited
+
+                    'week.timegridOneHour.height': '52px',
+                    'week.timegridHalfHour.height': '26px',
+                    'week.timegridHalfHour.borderBottom': 'none',
+                    'week.timegridHorizontalLine.borderBottom': 'none', // edited
+
+                    'week.timegrid.paddingRight': '8px',
+                    'week.timegrid.borderRight': '1px solid #444', // edited
+                    'week.timegridSchedule.borderRadius': '2px',
+                    'week.timegridSchedule.paddingLeft': '2px',
+
+                    'week.currentTime.color': '#515ce6', // edited
+
+                    'week.pastTime.color': '#bbb', // edited
+                    'week.futureTime.color': 'white', // edited
+
+                    'week.currentTimeLinePast.border': '1px dashed #515ce6',
+                    'week.currentTimeLineBullet.backgroundColor': '#515ce6',
+                    'week.currentTimeLineToday.border': '1px solid #515ce6',
+
+                    // week creation guide style
+                    'week.creationGuide.color': '#515ce6',
+                }
+            };
+        },
+
+        mounted: function() {
+            this.buildCalendar();
+        },
+
+        watch: {
+
+            'playerChannels': {
+                deep: true,
+                handler() { this.buildCalendar(); },
+            },
+        },
+
+        methods: {
+            buildCalendar: function() {
+                this.calendars = this.playerChannels.map(channel => ({
+                    id: channel.id.toString(),
+                    name: channel.name,
+                    color: 'white',
+                }));
+                this.schedules = [].concat(
+                    ... this.playerChannels.map(channel =>
+                            channel.schedule.events.map(event => ({
+                                id: `${channel.id}:${event.start}`,
+                                calendarId: channel.id.toString(),
+                                category: 'time',
+                                title: event.media.title,
+                                start: new Date(event.start).toISOString(),
+                                end: new Date(event.start + event.duration).toISOString(),
+                            })))
+                );
+                Vue.nextTick(() => {
+                    console.log(this.$refs.calendar);
+                });
+                console.log(this.calendars, this.schedules);
+            },
+        },
+
+        computed: {
+            ...mapState('Main', [
+                'playerChannels',
+            ]),
+        },
+    });
+</script>
+
+<style lang="scss" >
+    .calendar-container {
+        overflow: hidden;
+        height: 100%;
+    }
+
+    .tui-calendar {
+        height: 100%;
+
+        .tui-full-calendar-weekday-schedule-title {
+            color: white !important;
+        }
+
+        .tui-full-calendar-popup-container {
+            background-color: #333 !important;
+            color: white !important;
+        }
+    }
+</style>
diff --git a/app/client/src/vue/components/user/UserListRow.vue b/app/client/src/vue/components/user/UserListRow.vue
index d5dd1d39..0ae84c20 100644
--- a/app/client/src/vue/components/user/UserListRow.vue
+++ b/app/client/src/vue/components/user/UserListRow.vue
@@ -1,5 +1,6 @@
 <template>
     <hover-card
+        :clickable="true"
         :selected="false"
         :border-color="session.user.data.plugins.color"
         class="user-list-row"
@@ -96,7 +97,7 @@
 <style lang="scss" scoped>
 
 .user-list-row {
-    margin-bottom: 4px;
+    margin-top: 2px;
 
     .connected-session {
         width: 100%;
@@ -120,7 +121,7 @@
             padding: 10px;
             position: relative;
             
-            >.image-bubble{
+            >.image-bubble {
                 width: 100%;
                 height: 100%;
             }
diff --git a/app/client/src/vue/components/util/HoverCard.vue b/app/client/src/vue/components/util/HoverCard.vue
index a4ca2775..8535b83e 100644
--- a/app/client/src/vue/components/util/HoverCard.vue
+++ b/app/client/src/vue/components/util/HoverCard.vue
@@ -3,6 +3,7 @@
         :class="{
             'selected': selected,
             'highlighted': highlighted,
+            'clickable': clickable,
         }">
         <div class="hover-card-border" :style="{'background-color': borderColor}"></div>
         <div class="hover-card-content">
@@ -15,7 +16,7 @@
     import Vue from "vue";
 
     export default Vue.extend({
-        props: ['selected', 'highlighted', 'borderColor'],
+        props: ['clickable', 'selected', 'highlighted', 'borderColor'],
     });
 </script>
 
@@ -25,7 +26,6 @@
 
         width: 100%;
         display: flex;
-        cursor: pointer;
         color: white;
         justify-content: end;
         justify-items: end;
@@ -46,6 +46,10 @@
             overflow-y: auto;
         }
 
+        &.clickable {
+            cursor: pointer;
+        }
+
         &.selected {
             margin-left: 4px;
         }
diff --git a/app/client/src/vue/components/video-player/VideoPlayer.vue b/app/client/src/vue/components/video-player/VideoPlayer.vue
index b20a3aed..1702cbef 100644
--- a/app/client/src/vue/components/video-player/VideoPlayer.vue
+++ b/app/client/src/vue/components/video-player/VideoPlayer.vue
@@ -20,6 +20,7 @@
         computed: {
             ...mapState('Main', [
                 'playerState',
+                'playerEnabled',
                 'playerStateLastUpdate',
             ]),
         }
diff --git a/app/client/src/vue/components/video-player/VideoPlayerPreview.vue b/app/client/src/vue/components/video-player/VideoPlayerPreview.vue
index e1d19c82..7469cdec 100644
--- a/app/client/src/vue/components/video-player/VideoPlayerPreview.vue
+++ b/app/client/src/vue/components/video-player/VideoPlayerPreview.vue
@@ -3,16 +3,16 @@
         <div class="youtube-preview pr-2">
 
             <!-- preview container -->
-            <div class="preview-image-container">
+            <div class="preview-image-container"
+                :style="{
+                    'background-image': playerState.current ? `url(${playerState.current.video.thumb})` : 'none'
+                }">
 
                 <!-- progress bars -->
                 <div class="progress-bar progress-bar-top" :class="'custom-color-' + progressBarColor" :style="{'width': (100 * cursorPercent) + '%'}"></div>
                 <div class="progress-bar progress-bar-bottom" :class="'custom-color-' + progressBarColor" :style="{'width': (100 * cursorPercent) + '%'}"></div>
                 <div class="progress-bar progress-bar-left" :class="'custom-color-' + progressBarColor" :style="{'height': (100 * cursorPercent) + '%'}"></div>
                 <div class="progress-bar progress-bar-right" :class="'custom-color-' + progressBarColor" :style="{'height': (100 * cursorPercent) + '%'}"></div>
-
-                <!-- image preview -->
-                <img class="preview-thumb" v-if="playerState.current" :src="playerState.current.video.thumb">
     
                 <!-- title -->
                 <div class="preview-title" v-if="playerState.current">{{playerState.current.video.title}}</div>
@@ -35,7 +35,7 @@
                         <!-- video preview image -->
                         <div class="image avatar">
                             <div class="image-bubble" :style="'box-shadow: #' + progressBarColor +' 0 0 4px 0;'">
-                                <img data-v-193da69e="" :src="video.video.thumb">
+                                <img :src="video.video.thumb">
                             </div>
                         </div>
 
@@ -47,7 +47,17 @@
                     </div>
                 </div>
                     
-                <!-- actions -->
+                <!-- bottom actions -->
+                <div v-if="nextEvent" class="preview-actions next-event">
+                    <b>{{ new Date(nextEvent.start).toLocaleTimeString() }}</b>
+                    <div class="video-in-queue">
+                        <div class="image avatar">
+                            <div class="image-bubble" :style="'box-shadow: #' + progressBarColor +' 0 0 4px 0;'">
+                                <img :src="nextEvent.media.thumb">
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="preview-actions">
                     <div v-show="canHandlePlayer() && playerState.current && playerState.current.video.duration !== 0"
                         @click="ytReplay30"
@@ -167,7 +177,16 @@
             ...mapState('Main', [
                 'user',
                 'playerState',
+                'playerChannels',
+                'playerChannel',
             ]),
+            nextEvent: function() {
+                if (! this.playerChannel) {
+                    return null;
+                }
+                const nextEvents = this.playerChannel.schedule.events.filter(event => event.start + event.duration > new Date().getTime());
+                return nextEvents.length > 0 ? nextEvents[0] : null;
+            },
             nextQueuedEntries: function() {
                 return this.playerState.queue.slice(0, 30);
             }
@@ -180,7 +199,7 @@
     .youtube-preview {
 
         width: 100%;
-        height: 160px;
+        height: 230px;
         display: flex;
         padding-left: 6px;
         color: white;
@@ -189,6 +208,9 @@
             position: relative;
             flex-basis: 284.444444444px;
             background-color: black;
+            background-size: cover;
+            background-repeat: no-repeat;
+            background-position: center;
             
             > .progress-bar {
                 position: absolute;
@@ -216,13 +238,6 @@
                 }
             }
 
-            > .preview-thumb {
-                position: absolute;
-                width: 100%;
-                height: 100%;
-                padding: 2px;
-            }
-
             > .preview-title {
                 position: absolute;
                 left: 8px;
@@ -232,9 +247,12 @@
                 -ms-text-overflow: ellipsis;
                 text-overflow: ellipsis;
                 margin-bottom: 2px;
-                width: calc(100% - 16px);
+                max-width: calc(100% - 16px);
                 font-size: 120%;
                 font-weight: 600;
+                padding: 4px;
+                background-color: #0000004d;
+                border-radius: 4px;
             }
 
             > .sliding-window {
@@ -268,11 +286,6 @@
             overflow: hidden;
             z-index: 1;
 
-            >.preview-thumb {
-                flex-grow: 1;
-                width: 0;
-            }
-
         }
 
         .progress {
@@ -337,37 +350,36 @@
                 justify-content: center;
                 position: relative;
                 padding: 4px;
+            }
 
-                .video-in-queue {
-                    display: flex;
+            .video-in-queue {
+                display: flex;
+                justify-content: center;
+                margin: 5px;
+                position: relative;
+
+                .image {
                     width: 40px;
                     height: 40px;
-                    margin: 5px;
-                    position: relative;
-
-                    .image {
-                        width: 40px;
-                        height: 40px;
-                        display: flex;
+                    display: flex;
 
-                        .image-bubble {
-                            transition: all 1s ease-in-out;
-                        }
+                    .image-bubble {
+                        transition: all 1s ease-in-out;
                     }
-                    svg {
-                        position: absolute;
-                        top: -5px;
-                        left: -5px;
-
-                        circle {
-                            fill: none;
-                            transition: all 1s ease-in-out;
-                            stroke-width: 2px;
-                            stroke-dasharray: 1000;
-                            transform-origin: center center;
-                            transform: rotate(-85deg);
-                            animation: rotate 60s linear infinite;
-                        }
+                }
+                svg {
+                    position: absolute;
+                    top: -5px;
+                    left: -5px;
+
+                    circle {
+                        fill: none;
+                        transition: all 1s ease-in-out;
+                        stroke-width: 2px;
+                        stroke-dasharray: 1000;
+                        transform-origin: center center;
+                        transform: rotate(-85deg);
+                        animation: rotate 60s linear infinite;
                     }
                 }
             }
@@ -377,6 +389,15 @@
                 display: flex;
                 justify-content: center;
                 padding-top: 4px;
+                width: inherit;
+
+                &.next-event {
+                    flex-basis: 60px;
+                    text-align: center;
+                    flex-direction: column;
+                    background: #424248;
+                    font-size: 80%;
+                }
 
                 .preview-action {
                     flex-grow: 1;
diff --git a/app/client/src/vue/components/video-player/implementations/EmbedPlayer.vue b/app/client/src/vue/components/video-player/implementations/EmbedPlayer.vue
index f903d952..2d22adce 100644
--- a/app/client/src/vue/components/video-player/implementations/EmbedPlayer.vue
+++ b/app/client/src/vue/components/video-player/implementations/EmbedPlayer.vue
@@ -2,7 +2,7 @@
     <div>
         <video
             ref="player"
-            class="player"
+            class="player embed"
             controls=""
             autoplay="1"
             name="media">
diff --git a/app/client/src/vue/components/video-player/implementations/TwitchPlayer.vue b/app/client/src/vue/components/video-player/implementations/TwitchPlayer.vue
index c7fa7ed5..55c695fb 100644
--- a/app/client/src/vue/components/video-player/implementations/TwitchPlayer.vue
+++ b/app/client/src/vue/components/video-player/implementations/TwitchPlayer.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <iframe
-            class="player"
+            class="player twitch"
             :src="src"
             frameborder="0"
             allowfullscreen="true"
diff --git a/app/client/src/vue/components/video-player/implementations/YoutubePlayer.vue b/app/client/src/vue/components/video-player/implementations/YoutubePlayer.vue
index 2ed5275d..92bb234e 100644
--- a/app/client/src/vue/components/video-player/implementations/YoutubePlayer.vue
+++ b/app/client/src/vue/components/video-player/implementations/YoutubePlayer.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <iframe ref="player"
-                class="player"
+                class="player youtube"
                 :src="src"
                 frameborder="0"
                 allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
diff --git a/app/client/src/vue/pages/TchatPage.vue b/app/client/src/vue/pages/TchatPage.vue
index 0a4fdea5..7eb40a0a 100644
--- a/app/client/src/vue/pages/TchatPage.vue
+++ b/app/client/src/vue/pages/TchatPage.vue
@@ -41,7 +41,7 @@
                 <!-- right col (connected list and metas) -->
                 <section class="right hide-mobile-left hide-mobile-middle scrollbar">
 
-                    <video-player-preview v-if="typeof playerChannel === 'number'" id="player-preview"></video-player-preview>
+                    <video-player-preview v-if="typeof playerChannelId === 'number'" id="player-preview"></video-player-preview>
 
                     <user-list id="connected-list" class="scrollbar"></user-list>
 
@@ -90,7 +90,7 @@
             ...mapState('Main', [
                 'page',
                 'cinemaMode',
-                'playerChannel',
+                'playerChannelId',
             ]),
         },
     });
@@ -179,8 +179,7 @@
                 padding-bottom: 4px;
 
                 #player-preview {
-                    flex-basis: 160px;
-                    min-height: 160px;
+                    margin-bottom: 20px;
                 }
 
                 #connected-list {
diff --git a/app/client/src/vue/store/Main.store.js b/app/client/src/vue/store/Main.store.js
index c2f96b70..0d0976f4 100644
--- a/app/client/src/vue/store/Main.store.js
+++ b/app/client/src/vue/store/Main.store.js
@@ -125,6 +125,7 @@ const state = {
      */
     playerApiSearchResult: {},
     playerChannels: [],
+    playerChannelId: null,
     playerChannel: null,
     playerState: {
         current: null,
@@ -147,6 +148,70 @@ const getters = {
 // Actions 
 const actions = {
     
+    setConnectedList({ state, commit, dispatch }, connectedList) {
+        commit('SET_CONNECTED_LIST', connectedList);
+
+        // Update hash list of last message seen ids
+        dispatch('generateLastMessageSeenIds');
+        dispatch('generateRoomConnectedCounts');
+
+        // Update self entry
+        const selfEntry = connectedList.find(entry => entry.user.username === state.user.username);
+        if (! selfEntry) {
+            return;
+        }
+        commit('SET_USER', selfEntry.user);
+    },
+
+    messageSeen({ commit, dispatch }, messageSeen) {
+        commit('SET_LAST_SEEN', messageSeen);
+        dispatch('generateLastMessageSeenIds');
+    },
+
+    generateRoomConnectedCounts({ commit, state }) {
+        const roomConnectedUsers = {};
+        const playerChannelUsers = {};
+        for (const entry of state.connectedList) {
+
+            // Update room entries
+            for (const roomId of entry.rooms) {
+                if (typeof roomConnectedUsers[roomId] === 'undefined') {
+                    roomConnectedUsers[roomId] = [];
+                }
+                roomConnectedUsers[roomId].push(entry.user);
+            }
+
+            // Update player channel entries
+            const playerChannelId = entry.user.data.plugins.player;
+            if (playerChannelId !== null) {
+                if (typeof playerChannelUsers[playerChannelId] === 'undefined') {
+                    playerChannelUsers[playerChannelId] = [];
+                }
+                playerChannelUsers[playerChannelId].push(entry.user);
+            }
+        }
+        commit('SET_ROOM_CONNECTED_USERS', roomConnectedUsers);
+        commit('SET_PLAYER_CHANNEL_USERS', playerChannelUsers);
+    },
+
+    generateLastMessageSeenIds({ commit, state }) {
+
+        // Update last seen message ids
+        const lastSeen = {};
+        const roomId = state.currentRoom;
+        for (const entry of state.connectedList) {
+            const entries = entry.user.data.plugins.lastseen;
+            if (! entries || ! entries[roomId]) {
+                continue;
+            }
+            const lastSeenId = entries[roomId];
+            if (typeof lastSeen[lastSeenId] === 'undefined') {
+                lastSeen[lastSeenId] = [];
+            }
+            lastSeen[lastSeenId].push(entry.user);
+        }
+        commit('SET_LAST_MESSAGE_SEEN_IDS', lastSeen);
+    },
 };
 
 // Mutations
@@ -220,69 +285,24 @@ const mutations = {
     SET_OP(state, op) {
         state.op = !! op;
     },
-    SET_CONNECTED_LIST(state, entries) {
-        state.connectedList = entries;
-
-        // Update hash list of last message seen ids
-        this.commit('GENERATE_LAST_MESSAGE_SEEN_IDS');
-        this.commit('GENERATE_ROOM_CONNECTED_COUNTS');
-
-        // Update self entry
-        const selfEntry = entries.find(entry => entry.user.username === state.user.username);
-        if (! selfEntry) {
-            return;
-        }
-        this.commit('SET_USER', selfEntry.user);
+    SET_CONNECTED_LIST(state, connectedList) {
+        state.connectedList = connectedList;
     },
-    MESSAGE_SEEN(state, data) {
-        const entry = state.connectedList.find(e => e.user.id === data.user);
-        if (! entry) {
-            return;
-        }
-        entry.user.data.plugins.lastseen = data.data;
-        this.commit('GENERATE_LAST_MESSAGE_SEEN_IDS');
+    SET_ROOM_CONNECTED_USERS(state, roomConnectedUsers) {
+        state.roomConnectedUsers = roomConnectedUsers;
     },
-    GENERATE_LAST_MESSAGE_SEEN_IDS(state) {
-        // Update last seen message ids
-        const lastSeen = {};
-        const roomId = state.currentRoom;
-        for (const entry of state.connectedList) {
-            const entries = entry.user.data.plugins.lastseen;
-            if (! entries || ! entries[roomId]) {
-                continue;
-            }
-            const lastSeenId = entries[roomId];
-            if (typeof lastSeen[lastSeenId] === 'undefined') {
-                lastSeen[lastSeenId] = [];
-            }
-            lastSeen[lastSeenId].push(entry.user);
-        }
-        state.lastMessageSeenIds = lastSeen;
+    SET_PLAYER_CHANNEL_USERS(state, playerChannelUsers) {
+        state.playerChannelUsers = playerChannelUsers;
     },
-    GENERATE_ROOM_CONNECTED_COUNTS(state) {
-        const roomConnectedUsers = {};
-        const playerChannelUsers = {};
-        for (const entry of state.connectedList) {
-
-            // Update room entries
-            for (const roomId of entry.rooms) {
-                if (typeof roomConnectedUsers[roomId] === 'undefined') {
-                    roomConnectedUsers[roomId] = [];
-                }
-                roomConnectedUsers[roomId].push(entry.user);
-            }
-
-            // Update player channel entries
-            const playerChannelId = entry.user.data.plugins.player;
-            if (playerChannelId !== null) {
-                if (typeof playerChannelUsers[playerChannelId] === 'undefined') {
-                    playerChannelUsers[playerChannelId] = [];
-                }
-                playerChannelUsers[playerChannelId].push(entry.user);
-            }
+    SET_LAST_MESSAGE_SEEN_IDS(state, lastMessageSeenIds) {
+        state.lastMessageSeenIds = lastMessageSeenIds;
+    },
+    SET_LAST_SEEN(state, messageSeen) {
+        const entry = state.connectedList.find(e => e.user.id === messageSeen.user);
+        if (! entry) {
+            return;
         }
-        state.roomConnectedUsers = roomConnectedUsers;
-        state.playerChannelUsers = playerChannelUsers;
+        entry.user.data.plugins.lastseen = messageSeen.data;
     },
     NEW_MESSAGE(state, message) {
         state.messages.push(message);
@@ -329,7 +349,7 @@ const mutations = {
     },
     SET_PLAYER_ENABLED(state, playerEnabled) {
         state.playerEnabled = playerEnabled;
-        this.commit('SAVE_LOCALSTORAGE');
+        this.commit('Main/SAVE_LOCALSTORAGE');
     },
     SET_PLAYER_INTENSITY(state, intensity) {
         state.playerIntensity = intensity;
@@ -349,7 +369,7 @@ const mutations = {
     },
     SET_QUICK_ACTIONS_VISIBILITY(state, visible) {
         state.isQuickActionsVisible = !! visible;
-        this.commit('SAVE_LOCALSTORAGE');
+        this.commit('Main/SAVE_LOCALSTORAGE');
     },
     SET_TYPING_LIST(state, users) {
         state.typingList = users;
@@ -401,7 +421,8 @@ const mutations = {
     },
 
     SET_PLAYER_CHANNEL(state, channelId) {
-        state.playerChannel = channelId;
+        state.playerChannelId = channelId;
+        state.playerChannel = state.playerChannels.find(c => c.id === channelId);
     }
 };
 
diff --git a/app/server/skychat/GlobalPlugin.ts b/app/server/plugins/GlobalPlugin.ts
similarity index 92%
rename from app/server/skychat/GlobalPlugin.ts
rename to app/server/plugins/GlobalPlugin.ts
index a69184bb..b7658419 100644
--- a/app/server/skychat/GlobalPlugin.ts
+++ b/app/server/plugins/GlobalPlugin.ts
@@ -1,6 +1,6 @@
-import {Connection} from "./Connection";
+import {Connection} from "../skychat/Connection";
 import {Plugin} from "./Plugin";
-import { RoomManager } from "./RoomManager";
+import { RoomManager } from "../skychat/RoomManager";
 
 
 /**
diff --git a/app/server/skychat/Plugin.ts b/app/server/plugins/Plugin.ts
similarity index 96%
rename from app/server/skychat/Plugin.ts
rename to app/server/plugins/Plugin.ts
index 31f65bbe..d60daba5 100644
--- a/app/server/skychat/Plugin.ts
+++ b/app/server/plugins/Plugin.ts
@@ -1,10 +1,10 @@
-import {Connection} from "./Connection";
+import {Connection} from "../skychat/Connection";
 import * as fs from "fs";
-import { Session } from "./Session";
-import { User } from "./User";
-import { Room } from "./Room";
-import { Config } from "./Config";
-import { UserController } from "./UserController";
+import { Session } from "../skychat/Session";
+import { User } from "../skychat/User";
+import { Room } from "../skychat/Room";
+import { Config } from "../skychat/Config";
+import { UserController } from "../skychat/UserController";
 
 
 /**
diff --git a/app/server/skychat/RoomPlugin.ts b/app/server/plugins/RoomPlugin.ts
similarity index 92%
rename from app/server/skychat/RoomPlugin.ts
rename to app/server/plugins/RoomPlugin.ts
index 1d716edd..63ff859c 100644
--- a/app/server/skychat/RoomPlugin.ts
+++ b/app/server/plugins/RoomPlugin.ts
@@ -1,7 +1,7 @@
-import { Connection } from "./Connection";
-import { Message } from "./Message";
+import { Connection } from "../skychat/Connection";
+import { Message } from "../skychat/Message";
 import { Plugin } from "./Plugin";
-import { Room } from "./Room";
+import { Room } from "../skychat/Room";
 
 
 export abstract class RoomPlugin extends Plugin {
diff --git a/app/server/plugins/core/AccountPlugin.ts b/app/server/plugins/core/AccountPlugin.ts
index 9872676c..2bde83e5 100644
--- a/app/server/plugins/core/AccountPlugin.ts
+++ b/app/server/plugins/core/AccountPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {UserController} from "../../skychat/UserController";
 import {User} from "../../skychat/User";
 import { Config } from "../../skychat/Config";
diff --git a/app/server/plugins/core/AudioRecorderPlugin.ts b/app/server/plugins/core/AudioRecorderPlugin.ts
index 546a1af0..3575ca9f 100644
--- a/app/server/plugins/core/AudioRecorderPlugin.ts
+++ b/app/server/plugins/core/AudioRecorderPlugin.ts
@@ -1,4 +1,4 @@
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { Connection } from "../../skychat/Connection";
 import { User } from "../../skychat/User";
 import { MessageFormatter } from "../../skychat/MessageFormatter";
diff --git a/app/server/plugins/core/BackupPlugin.ts b/app/server/plugins/core/BackupPlugin.ts
index d249b1f2..7c286bb1 100644
--- a/app/server/plugins/core/BackupPlugin.ts
+++ b/app/server/plugins/core/BackupPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import { UserController } from "../../skychat/UserController";
 import {exec} from 'child_process';
 
diff --git a/app/server/plugins/core/ConnectedListPlugin.ts b/app/server/plugins/core/ConnectedListPlugin.ts
index 00c2860d..6ff97312 100644
--- a/app/server/plugins/core/ConnectedListPlugin.ts
+++ b/app/server/plugins/core/ConnectedListPlugin.ts
@@ -1,7 +1,7 @@
 import {Connection} from "../../skychat/Connection";
 import {Session} from "../../skychat/Session";
 import { Config } from "../../skychat/Config";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 
 
diff --git a/app/server/plugins/core/FileEditorPlugin.ts b/app/server/plugins/core/FileEditorPlugin.ts
index fb3f762f..691042d2 100644
--- a/app/server/plugins/core/FileEditorPlugin.ts
+++ b/app/server/plugins/core/FileEditorPlugin.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import { Config } from "../../skychat/Config";
 import { Connection } from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 export class FileEditorPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/core/GiveMoneyPlugin.ts b/app/server/plugins/core/GiveMoneyPlugin.ts
index b67febc8..187caa65 100644
--- a/app/server/plugins/core/GiveMoneyPlugin.ts
+++ b/app/server/plugins/core/GiveMoneyPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Session} from "../../skychat/Session";
 import {User} from "../../skychat/User";
 import {ConnectedListPlugin} from "./ConnectedListPlugin";
diff --git a/app/server/plugins/core/HelpPlugin.ts b/app/server/plugins/core/HelpPlugin.ts
index 455d4324..f859ee2f 100644
--- a/app/server/plugins/core/HelpPlugin.ts
+++ b/app/server/plugins/core/HelpPlugin.ts
@@ -1,5 +1,5 @@
-import {PluginCommandRules} from "../../skychat/Plugin";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {PluginCommandRules} from "../Plugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Connection} from "../../skychat/Connection";
 import * as striptags from "striptags";
 import {Config} from "../../skychat/Config";
diff --git a/app/server/plugins/core/MailPlugin.ts b/app/server/plugins/core/MailPlugin.ts
index d0b8f7b6..fb59aea5 100644
--- a/app/server/plugins/core/MailPlugin.ts
+++ b/app/server/plugins/core/MailPlugin.ts
@@ -5,7 +5,7 @@ import * as Mail from "nodemailer/lib/mailer";
 import {SentMessageInfo} from "nodemailer";
 import {UserController} from "../../skychat/UserController";
 import {User} from "../../skychat/User";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 
 
diff --git a/app/server/plugins/core/MessageEditPlugin.ts b/app/server/plugins/core/MessageEditPlugin.ts
index e0a3bca2..e23744d0 100644
--- a/app/server/plugins/core/MessageEditPlugin.ts
+++ b/app/server/plugins/core/MessageEditPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import { RoomPlugin } from "../../skychat/RoomPlugin";
+import { RoomPlugin } from "../RoomPlugin";
 
 
 export class MessageEditPlugin extends RoomPlugin {
diff --git a/app/server/plugins/core/MessageHistoryPlugin.ts b/app/server/plugins/core/MessageHistoryPlugin.ts
index b01ab301..99a31c4c 100644
--- a/app/server/plugins/core/MessageHistoryPlugin.ts
+++ b/app/server/plugins/core/MessageHistoryPlugin.ts
@@ -1,4 +1,4 @@
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Connection} from "../../skychat/Connection";
 import {Message} from "../../skychat/Message";
 import {Room} from "../../skychat/Room";
diff --git a/app/server/plugins/core/MessagePlugin.ts b/app/server/plugins/core/MessagePlugin.ts
index cc8f4f1b..e84f6afe 100644
--- a/app/server/plugins/core/MessagePlugin.ts
+++ b/app/server/plugins/core/MessagePlugin.ts
@@ -1,7 +1,7 @@
 import {Connection} from "../../skychat/Connection";
 import { Config } from "../../skychat/Config";
 import { MessageController } from "../../skychat/MessageController";
-import { RoomPlugin } from "../../skychat/RoomPlugin";
+import { RoomPlugin } from "../RoomPlugin";
 
 
 export class MessagePlugin extends RoomPlugin {
diff --git a/app/server/plugins/core/MessageSeenPlugin.ts b/app/server/plugins/core/MessageSeenPlugin.ts
index 811e364b..24741ec2 100644
--- a/app/server/plugins/core/MessageSeenPlugin.ts
+++ b/app/server/plugins/core/MessageSeenPlugin.ts
@@ -1,4 +1,4 @@
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Connection} from "../../skychat/Connection";
 import {UserController} from "../../skychat/UserController";
 
diff --git a/app/server/plugins/core/MoneyFarmerPlugin.ts b/app/server/plugins/core/MoneyFarmerPlugin.ts
index 7ab5b217..1ca477c2 100644
--- a/app/server/plugins/core/MoneyFarmerPlugin.ts
+++ b/app/server/plugins/core/MoneyFarmerPlugin.ts
@@ -2,7 +2,7 @@ import {Connection} from "../../skychat/Connection";
 import {User} from "../../skychat/User";
 import {ConnectedListPlugin} from "./ConnectedListPlugin";
 import {UserController} from "../../skychat/UserController";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { Session } from "../../skychat/Session";
 import { RoomManager } from "../../skychat/RoomManager";
 
diff --git a/app/server/plugins/core/OPPlugin.ts b/app/server/plugins/core/OPPlugin.ts
index 4f209bbb..4390b5bb 100644
--- a/app/server/plugins/core/OPPlugin.ts
+++ b/app/server/plugins/core/OPPlugin.ts
@@ -1,6 +1,6 @@
 import { Config } from "../../skychat/Config";
 import { Connection } from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { UserController } from "../../skychat/UserController";
 
 
diff --git a/app/server/plugins/core/PrivateMessagePlugin.ts b/app/server/plugins/core/PrivateMessagePlugin.ts
index 4ddf5d53..d14275ca 100644
--- a/app/server/plugins/core/PrivateMessagePlugin.ts
+++ b/app/server/plugins/core/PrivateMessagePlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {Session} from "../../skychat/Session";
 import {User} from "../../skychat/User";
 import { Config } from "../../skychat/Config";
diff --git a/app/server/plugins/core/RankPlugin.ts b/app/server/plugins/core/RankPlugin.ts
index ae7b50b9..245abf79 100644
--- a/app/server/plugins/core/RankPlugin.ts
+++ b/app/server/plugins/core/RankPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {ConnectedListPlugin} from "./ConnectedListPlugin";
 import {UserController} from "../../skychat/UserController";
 import { Config } from "../../skychat/Config";
diff --git a/app/server/plugins/core/RoomManagerPlugin.ts b/app/server/plugins/core/RoomManagerPlugin.ts
index 22ba9150..acb9206f 100644
--- a/app/server/plugins/core/RoomManagerPlugin.ts
+++ b/app/server/plugins/core/RoomManagerPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import { UserController } from "../../skychat/UserController";
 import { Config } from "../../skychat/Config";
 import { Room } from "../../skychat/Room";
diff --git a/app/server/plugins/core/TypingListPlugin.ts b/app/server/plugins/core/TypingListPlugin.ts
index 753c9315..403c4972 100644
--- a/app/server/plugins/core/TypingListPlugin.ts
+++ b/app/server/plugins/core/TypingListPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {User} from "../../skychat/User";
 
 
diff --git a/app/server/plugins/core/VoidPlugin.ts b/app/server/plugins/core/VoidPlugin.ts
index 63f0307f..5b849fb0 100644
--- a/app/server/plugins/core/VoidPlugin.ts
+++ b/app/server/plugins/core/VoidPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 
 
 export class VoidPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/customization/AvatarPlugin.ts b/app/server/plugins/customization/AvatarPlugin.ts
index 628c3564..f6e307ad 100644
--- a/app/server/plugins/customization/AvatarPlugin.ts
+++ b/app/server/plugins/customization/AvatarPlugin.ts
@@ -5,7 +5,7 @@ import {UserController} from "../../skychat/UserController";
 import * as fs from 'fs';
 import { FileManager } from "../../skychat/FileManager";
 import { Server } from "../../skychat/Server";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 export class AvatarPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/customization/ColorPlugin.ts b/app/server/plugins/customization/ColorPlugin.ts
index d71c2ed6..256b7e1d 100644
--- a/app/server/plugins/customization/ColorPlugin.ts
+++ b/app/server/plugins/customization/ColorPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 
 
 export class ColorPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/customization/CursorPlugin.ts b/app/server/plugins/customization/CursorPlugin.ts
index a82d68bf..ccc6ce08 100644
--- a/app/server/plugins/customization/CursorPlugin.ts
+++ b/app/server/plugins/customization/CursorPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {User} from "../../skychat/User";
 import {UserController} from "../../skychat/UserController";
 import { Session } from "../../skychat/Session";
diff --git a/app/server/plugins/customization/HaloPlugin.ts b/app/server/plugins/customization/HaloPlugin.ts
index 3b14f33a..22bd8c0b 100644
--- a/app/server/plugins/customization/HaloPlugin.ts
+++ b/app/server/plugins/customization/HaloPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 
 
 export class HaloPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/customization/MottoPlugin.ts b/app/server/plugins/customization/MottoPlugin.ts
index 1ae7b0a7..771d7203 100644
--- a/app/server/plugins/customization/MottoPlugin.ts
+++ b/app/server/plugins/customization/MottoPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {ConnectedListPlugin} from "../core/ConnectedListPlugin";
 import {UserController} from "../../skychat/UserController";
 
diff --git a/app/server/plugins/customization/PinnedIconPlugin.ts b/app/server/plugins/customization/PinnedIconPlugin.ts
index 8a938f15..24ed5d7f 100644
--- a/app/server/plugins/customization/PinnedIconPlugin.ts
+++ b/app/server/plugins/customization/PinnedIconPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 
 
 export class PinnedIconPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/customization/ShopPlugin.ts b/app/server/plugins/customization/ShopPlugin.ts
index ea76beb5..26ff66f1 100644
--- a/app/server/plugins/customization/ShopPlugin.ts
+++ b/app/server/plugins/customization/ShopPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {ColorPlugin} from "./ColorPlugin";
 import {User} from "../../skychat/User";
 import {ConnectedListPlugin} from "../core/ConnectedListPlugin";
diff --git a/app/server/plugins/entertainment/DailyRollPlugin.ts b/app/server/plugins/entertainment/DailyRollPlugin.ts
index a7109ad8..7144db66 100644
--- a/app/server/plugins/entertainment/DailyRollPlugin.ts
+++ b/app/server/plugins/entertainment/DailyRollPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import { UserController } from "../../skychat/UserController";
 import { Room } from "../../skychat/Room";
 import { Message } from "../../skychat/Message";
diff --git a/app/server/plugins/entertainment/GuessTheNumberPlugin.ts b/app/server/plugins/entertainment/GuessTheNumberPlugin.ts
index 18b87d5f..c85347cc 100644
--- a/app/server/plugins/entertainment/GuessTheNumberPlugin.ts
+++ b/app/server/plugins/entertainment/GuessTheNumberPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {UserController} from "../../skychat/UserController";
 import {Message} from "../../skychat/Message";
 import {Session} from "../../skychat/Session";
diff --git a/app/server/plugins/entertainment/PointsCollectorPlugin.ts b/app/server/plugins/entertainment/PointsCollectorPlugin.ts
index 5cc72af9..ba1c4bd7 100644
--- a/app/server/plugins/entertainment/PointsCollectorPlugin.ts
+++ b/app/server/plugins/entertainment/PointsCollectorPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {UserController} from "../../skychat/UserController";
 import * as striptags from "striptags";
 import {MessageFormatter} from "../../skychat/MessageFormatter";
diff --git a/app/server/plugins/entertainment/RacingPlugin.ts b/app/server/plugins/entertainment/RacingPlugin.ts
index ec437f26..d4a6525b 100644
--- a/app/server/plugins/entertainment/RacingPlugin.ts
+++ b/app/server/plugins/entertainment/RacingPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {UserController} from "../../skychat/UserController";
 import * as striptags from "striptags";
 import {MessageFormatter} from "../../skychat/MessageFormatter";
diff --git a/app/server/plugins/entertainment/RandomGeneratorPlugin.ts b/app/server/plugins/entertainment/RandomGeneratorPlugin.ts
index 5d53d88a..6dbc8920 100644
--- a/app/server/plugins/entertainment/RandomGeneratorPlugin.ts
+++ b/app/server/plugins/entertainment/RandomGeneratorPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {UserController} from "../../skychat/UserController";
 import { RandomGenerator } from "../../skychat/RandomGenerator";
 
diff --git a/app/server/plugins/entertainment/RisiBankPlugin.ts b/app/server/plugins/entertainment/RisiBankPlugin.ts
index 3582b900..696f1708 100644
--- a/app/server/plugins/entertainment/RisiBankPlugin.ts
+++ b/app/server/plugins/entertainment/RisiBankPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Message} from "../../skychat/Message";
 import {RisiBank, Sticker} from "risibank";
 
diff --git a/app/server/plugins/entertainment/RollPlugin.ts b/app/server/plugins/entertainment/RollPlugin.ts
index e67c755a..437e06b9 100644
--- a/app/server/plugins/entertainment/RollPlugin.ts
+++ b/app/server/plugins/entertainment/RollPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {Message} from "../../skychat/Message";
 import {UserController} from "../../skychat/UserController";
 import {Session} from "../../skychat/Session";
diff --git a/app/server/plugins/entertainment/SandalePlugin.ts b/app/server/plugins/entertainment/SandalePlugin.ts
index b938de78..07cd3bff 100644
--- a/app/server/plugins/entertainment/SandalePlugin.ts
+++ b/app/server/plugins/entertainment/SandalePlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
 import {UserController} from "../../skychat/UserController";
diff --git a/app/server/plugins/entertainment/StatsPlugin.ts b/app/server/plugins/entertainment/StatsPlugin.ts
index 8de3094f..33ce0df9 100644
--- a/app/server/plugins/entertainment/StatsPlugin.ts
+++ b/app/server/plugins/entertainment/StatsPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {RoomPlugin} from "../../skychat/RoomPlugin";
+import {RoomPlugin} from "../RoomPlugin";
 import {UserController} from "../../skychat/UserController";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
diff --git a/app/server/plugins/gallery/FileConverterPlugin.ts b/app/server/plugins/gallery/FileConverterPlugin.ts
index 7a6428eb..d961d888 100644
--- a/app/server/plugins/gallery/FileConverterPlugin.ts
+++ b/app/server/plugins/gallery/FileConverterPlugin.ts
@@ -1,14 +1,13 @@
 import {Connection} from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 import { GalleryMedia } from "./GalleryMedia";
 import { GalleryPlugin } from "./GalleryPlugin";
 import { spawn } from 'child_process';
 import { UserController } from "../../skychat/UserController";
 import * as fs from 'fs';
-import { Gallery } from "./Gallery";
-import { RandomGenerator } from "../../skychat/RandomGenerator";
 import { Config } from "../../skychat/Config";
+import { Session } from "../../skychat/Session";
 
 
 /**
@@ -27,7 +26,9 @@ export class FileConverterPlugin extends GlobalPlugin {
 
     static readonly commandName = 'convert';
 
-    public readonly opOnly = true;
+    public readonly minRight = typeof Config.PREFERENCES.minRightForGalleryWrite === 'number' ? Config.PREFERENCES.minRightForGalleryWrite : 0;
+
+    public readonly opOnly = Config.PREFERENCES.minRightForGalleryWrite === 'op';
 
     readonly rules = {
         convert: {
@@ -80,7 +81,18 @@ export class FileConverterPlugin extends GlobalPlugin {
         }
 
         // Run convert function
-        const convertedMediaPath: string = await method.bind(this)(gallery, connection, media);
+        let convertedMediaPath: string | undefined;
+        let thrownError: Error | undefined;
+        try {
+            convertedMediaPath = await method.bind(this)(connection, media);
+        } catch (error) {
+            thrownError = error;
+        }
+        const session = Session.getSessionByIdentifier(connection.session.identifier);
+        session && session.send('message', UserController.createNeutralMessage({ id: 0, content: `@${session.identifier} ` + (thrownError ? thrownError.message : 'File conversion finished')}).sanitized());
+        if (thrownError || ! convertedMediaPath) {
+            return;
+        }
 
         // Convert successful: Create new media and move converted file
         const mediaId = GalleryMedia.getNextId();
@@ -102,11 +114,22 @@ export class FileConverterPlugin extends GlobalPlugin {
         galleryPlugin.syncStorage();
     }
 
-    async webm_to_mp4(gallery: Gallery, connection: Connection, media: GalleryMedia) {
-        return this.convertVideoToMP4(gallery, connection, 'webm', media);
+    async webm_to_mp4(connection: Connection, media: GalleryMedia) {
+        return this.convertVideoToMP4(connection, 'webm', media);
+    }
+
+    async mkv_to_mp4(connection: Connection, media: GalleryMedia) {
+        return this.convertVideoToMP4(connection, 'mkv', media);
     }
 
-    convertVideoToMP4(gallery: Gallery, connection: Connection, sourceType: string, media: GalleryMedia) {
+    /**
+     * Convert any video to MP4 (supported in all browsers)
+     * @param connection 
+     * @param sourceType 
+     * @param media 
+     * @returns 
+     */
+    convertVideoToMP4(connection: Connection, sourceType: string, media: GalleryMedia) {
         return new Promise((resolve, reject) => {
             const currentMediaPath = media.getLocalPath();
             const convertedMediaPath = currentMediaPath.replace(new RegExp('\\.' + sourceType + '$'), `.mp4`);
@@ -115,35 +138,25 @@ export class FileConverterPlugin extends GlobalPlugin {
             const spawnArgs = rawCommand.substr(spawn0.length + 1).split(' ');
 
             // Prepare a message which will track the updates
-            const message = UserController.createNeutralMessage({ content: `Converting..`, });
+            const message = UserController.createNeutralMessage({ content: `Started file conversion`, });
             connection.send('message', message.sanitized());
 
             const process = spawn(spawn0, spawnArgs);
 
-            process.stdout.on("data", data => {
-                message.append(data);
-                connection.send('message-edit', message.sanitized());
-            });
-
-            process.stderr.on("data", data => {
-                message.append(data);
-                connection.send('message-edit', message.sanitized());
-            });
+            // STDOUT/STDERR
+            process.stdout.on("data", data => { console.info(data.toString()); });
+            process.stderr.on("data", data => { console.info(data.toString()); });
 
-            process.on('error', (error) => {
-                message.append(`\nProcess errro: ${error}`);
-                connection.send('message-edit', message.sanitized());
+            // Process error
+            process.on('error', error => {
                 reject(`Unable to convert file`);
             });
 
+            // Process finished
             process.on("close", code => {
-                message.append(`child process exited with code ${code}`);
-                connection.send('message-edit', message.sanitized());
 
                 // If there was an error (file is not there)
                 if (! fs.existsSync(convertedMediaPath)) {
-                    message.append(`\nUnable to convert file.`);
-                    connection.send('message-edit', message.sanitized());
                     reject(`Unable to convert file`);
                     return;
                 }
diff --git a/app/server/plugins/gallery/Gallery.ts b/app/server/plugins/gallery/Gallery.ts
index 02451efa..5697eb03 100644
--- a/app/server/plugins/gallery/Gallery.ts
+++ b/app/server/plugins/gallery/Gallery.ts
@@ -14,7 +14,7 @@ export type SanitizedGallery = {
 
 export class Gallery {
 
-    static readonly ALLOWED_EXTENSIONS: string[] = ['png', 'jpg', 'jpeg', 'gif', 'mp4', 'webm'];
+    static readonly ALLOWED_EXTENSIONS: string[] = ['png', 'jpg', 'jpeg', 'gif', 'mkv', 'mp4', 'webm'];
 
     private folders: GalleryFolder[] = [];
 
@@ -63,7 +63,7 @@ export class Gallery {
     buildMediaThumb(mediaUrl: string): string {
         const extension = FileManager.getFileExtension(mediaUrl);
 
-        if (['mp4', 'webm'].indexOf(extension) !== -1) {
+        if (['mp4', 'webm', 'mkv'].indexOf(extension) !== -1) {
             return 'assets/images/icons/video.png';
         }
 
diff --git a/app/server/plugins/gallery/GalleryMedia.ts b/app/server/plugins/gallery/GalleryMedia.ts
index b4cb25d7..305cccdf 100644
--- a/app/server/plugins/gallery/GalleryMedia.ts
+++ b/app/server/plugins/gallery/GalleryMedia.ts
@@ -1,4 +1,5 @@
 import { FileManager } from "../../skychat/FileManager";
+import * as fs from 'fs';
 
 
 export type SanitizedGalleryMedia = {
@@ -13,6 +14,13 @@ export type SanitizedGalleryMedia = {
 
 export class GalleryMedia {
 
+    public static readonly THUMB_EXTENSIONS = [
+        'jpg',
+        'jpeg',
+        'png',
+        'gif',
+    ];
+
     private static CURRENT_ID: number = 1;
 
     public static getNextId(): number {
@@ -53,6 +61,19 @@ export class GalleryMedia {
         return mtc[1];
     }
 
+    setThumb(imagePath: string) {
+        if (! fs.existsSync(imagePath)) {
+            throw new Error('File does not exist');
+        }
+        const extension = FileManager.getFileExtension(imagePath);
+        if (GalleryMedia.THUMB_EXTENSIONS.indexOf(extension) === -1) {
+            throw new Error('Extension not allowed');
+        }
+        const thumbPath = FileManager.getFileDirectory(this.getLocalPath()) + '/thumb.' + extension;
+        fs.copyFileSync(imagePath, thumbPath);
+        this.thumb = FileManager.getFileUrlFromLocalPath(thumbPath);
+    }
+
     sanitized(): SanitizedGalleryMedia {
         return {
             id: this.id,
diff --git a/app/server/plugins/gallery/GalleryPlugin.ts b/app/server/plugins/gallery/GalleryPlugin.ts
index 5f8b468e..98126e3c 100644
--- a/app/server/plugins/gallery/GalleryPlugin.ts
+++ b/app/server/plugins/gallery/GalleryPlugin.ts
@@ -1,10 +1,11 @@
 import { Config } from "../../skychat/Config";
 import {Connection} from "../../skychat/Connection";
 import { FileManager } from "../../skychat/FileManager";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 import { Server } from "../../skychat/Server";
 import { Session } from "../../skychat/Session";
+import { User } from "../../skychat/User";
 import { Gallery, SanitizedGallery } from "./Gallery";
 
 
@@ -13,11 +14,22 @@ import { Gallery, SanitizedGallery } from "./Gallery";
  */
 export class GalleryPlugin extends GlobalPlugin {
 
+    static readonly MAX_SHOWN_MEDIAS_PER_FOLDER = 20;
+
     static readonly commandName = 'gallery';
 
-    static readonly commandAliases = ['gallerysearch', 'galleryfolderadd', 'galleryfolderremove', 'galleryadd', 'gallerydelete'];
+    static readonly commandAliases = [
+        'gallerysearch',
+        'galleryfolderadd',
+        'galleryfolderremove',
+        'galleryadd',
+        'galleryset',
+        'gallerydelete'
+    ];
+
+    public readonly minRight = typeof Config.PREFERENCES.minRightForGalleryRead === 'number' ? Config.PREFERENCES.minRightForGalleryRead : 0;
 
-    public readonly minRight = Config.PREFERENCES.minRightForGallery;
+    public readonly opOnly = Config.PREFERENCES.minRightForGalleryRead === 'op';
 
     readonly rules = {
         gallery: { },
@@ -45,6 +57,16 @@ export class GalleryPlugin extends GlobalPlugin {
                 {name: "tags", pattern: /^.+$/},
             ]
         },
+        galleryset: {
+            minCount: 4,
+            maxCount: 4,
+            params: [
+                {name: "folderId", pattern: /^\d+$/},
+                {name: "mediaId", pattern: /^\d+$/},
+                {name: "key", pattern: /^(thumb)$/},
+                {name: "value", pattern: /./},
+            ]
+        },
         gallerydelete: {
             minCount: 2,
             maxCount: 2,
@@ -83,11 +105,28 @@ export class GalleryPlugin extends GlobalPlugin {
         }
     }
 
+    public canWrite(session: Session): boolean {
+        const expectedRight = Config.PREFERENCES.minRightForGalleryWrite === 'op' ? Infinity : Config.PREFERENCES.minRightForGalleryWrite;
+        const actualRight = session.isOP() ? Infinity : session.user.right;
+        return actualRight >= expectedRight;
+    }
+
+    public canRead(session: Session): boolean {
+        const expectedRight = Config.PREFERENCES.minRightForGalleryRead === 'op' ? Infinity : Config.PREFERENCES.minRightForGalleryRead;
+        const actualRight = session.isOP() ? Infinity : session.user.right;
+        return actualRight >= expectedRight;
+    }
+
     async run(alias: string, param: string, connection: Connection): Promise<void> {
 
         if (alias === 'gallerysearch') {
             return await this.handleGallerySearch(param, connection);
         }
+
+        // After this point, all calls must have write permission
+        if (! this.canWrite(connection.session)) {
+            throw new Error('You do not have write permission to the gallery');
+        }
         
         if (alias === 'galleryfolderadd') {
             return await this.handleGalleryFolderAdd(param, connection);
@@ -100,6 +139,10 @@ export class GalleryPlugin extends GlobalPlugin {
         if (alias === 'galleryadd') {
             return await this.handleGalleryAdd(param, connection);
         }
+        
+        if (alias === 'galleryset') {
+            return await this.handleGallerySet(param, connection);
+        }
 
         if (alias === 'gallerydelete') {
             return await this.handleGalleryDelete(param, connection);
@@ -112,27 +155,18 @@ export class GalleryPlugin extends GlobalPlugin {
     }
 
     async handleGalleryFolderAdd(param: string, connection: Connection): Promise<void> {
-        if (! connection.session.isOP()) {
-            throw new Error(`Only OP can manage folders`);
-        }
         const folderName = param.trim();
         const folder = this.gallery.createFolder(folderName);
         this.syncStorage();
     }
 
     async handleGalleryFolderRemove(param: string, connection: Connection): Promise<void> {
-        if (! connection.session.isOP()) {
-            throw new Error(`Only OP can manage folders`);
-        }
         const folderId = parseInt(param);
         this.gallery.deleteFolder(folderId);
         this.syncStorage();
     }
-
+    
     async handleGalleryAdd(param: string, connection: Connection): Promise<void> {
-        if (! connection.session.isOP()) {
-            throw new Error(`Only OP can manage medias`);
-        }
         const [rawLink, rawFolderId, rawTags] = param.split(' ');
         const link = rawLink;
         const folderId = parseInt(rawFolderId);
@@ -144,10 +178,32 @@ export class GalleryPlugin extends GlobalPlugin {
         this.syncStorage();
     }
 
-    async handleGalleryDelete(param: string, connection: Connection): Promise<void> {
-        if (! connection.session.isOP()) {
-            throw new Error(`Only OP can manage medias`);
+    async handleGallerySet(param: string, connection: Connection): Promise<void> {
+        const [rawFolderId, rawMediaId, key, value] = param.split(' ');
+        const folder = this.gallery.getFolderById(parseInt(rawFolderId));
+        if (! folder) {
+            throw new Error('Folder not found');
         }
+        const media = folder.getMediaById(parseInt(rawMediaId));
+        if (! media) {
+            throw new Error('Media not found');
+        }
+        switch (key) {
+            case 'thumb':
+                if (! FileManager.isFileUrlUploaded(value)) {
+                    throw new Error('Only uploaded files can be used as media thumbnails');
+                }
+                const localPath = FileManager.getLocalPathFromFileUrl(value);
+                media.setThumb(localPath);
+                break;
+            
+            default:
+                throw new Error(`Unable to set unknown key '${key}' on media`);
+        }
+        this.syncStorage();
+    }
+
+    async handleGalleryDelete(param: string, connection: Connection): Promise<void> {
         const [rawFolderId, rawMediaId] = param.split(' ');
         const folderId = parseInt(rawFolderId);
         const mediaId = parseInt(rawMediaId);
@@ -157,26 +213,33 @@ export class GalleryPlugin extends GlobalPlugin {
 
     async onNewConnection(connection: Connection): Promise<void> {
         // If gallery is available for everyone, send it
-        if (Config.PREFERENCES.minRightForGallery === -1) {
+        if (Config.PREFERENCES.minRightForGalleryRead === -1) {
             this.sync([connection.session]);
         }
     }
     
     public async onConnectionAuthenticated(connection: Connection): Promise<void> {
+        // If gallery was already sent
+        if (Config.PREFERENCES.minRightForGalleryRead === -1) {
+            return;
+        }
         // If user can access the gallery
-        if (Config.PREFERENCES.minRightForGallery > -1 && connection.session.user.right >= Config.PREFERENCES.minRightForGallery) {
+        if (this.canRead(connection.session)) {
             this.sync([connection.session]);
         }
     }
     
-    public sanitized(): SanitizedGallery {
-        return this.gallery.sanitized();
+    public sanitized(session: Session, limit?: number): { data: SanitizedGallery, canWrite: boolean } {
+        return {
+            data: this.gallery.sanitized(limit),
+            canWrite: this.canWrite(session),
+        };
     }
 
     public sync(sessionsOrNothing?: Session[]): void {
         const sessions: Session[] = sessionsOrNothing || Object.values(Session.sessions);
         for (const session of sessions) {
-            session.send('gallery', this.gallery.sanitized(4));
+            session.send('gallery', this.sanitized(session, GalleryPlugin.MAX_SHOWN_MEDIAS_PER_FOLDER));
         }
     }
 }
diff --git a/app/server/plugins/index.ts b/app/server/plugins/index.ts
index 6c36f5e8..1b4563e8 100644
--- a/app/server/plugins/index.ts
+++ b/app/server/plugins/index.ts
@@ -7,3 +7,6 @@ export * from "./optional";
 export * from "./poll";
 export * from "./user_defined";
 export * from "./player";
+export { GlobalPlugin } from "./GlobalPlugin";
+export { RoomPlugin } from "./RoomPlugin";
+export { Plugin } from "./Plugin";
diff --git a/app/server/plugins/moderation/BanPlugin.ts b/app/server/plugins/moderation/BanPlugin.ts
index 72c456f4..0f370479 100644
--- a/app/server/plugins/moderation/BanPlugin.ts
+++ b/app/server/plugins/moderation/BanPlugin.ts
@@ -6,13 +6,14 @@ import * as striptags from "striptags";
 import {MessageFormatter} from "../../skychat/MessageFormatter";
 import { Timing } from "../../skychat/Timing";
 import { Message } from "../../skychat/Message";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 
 
 enum BAN_TYPES {
     ACCESS = 0,
     SHADOW = 1,
+    BUG = 2,
 };
 
 
@@ -180,11 +181,20 @@ export class BanPlugin extends GlobalPlugin {
 
             // Only send new messages to himself
             if (message.startsWith('/message ')) {
-                connection.send('message', new Message({id: ++Message.ID, room: connection.roomId, content: message.substr('/message'.length), user: connection.session.user}).sanitized());
+                connection.send('message', new Message({
+                    id: Message.ID + 1, room: connection.roomId,
+                    content: message.substr('/message'.length),
+                    user: connection.session.user
+                }).sanitized());
                 connection.session.lastMessageDate = new Date();
                 return `/void`;
             }
         }
+        // If bug banned, make user lag
+        if (this.isBanned(connection, BAN_TYPES.BUG)) {
+            // Make message lag from 0 to 20s randomly
+            await Timing.sleep(20 * Math.random() * 1000);
+        }
         return message;
     }
 
diff --git a/app/server/plugins/moderation/HistoryClearPlugin.ts b/app/server/plugins/moderation/HistoryClearPlugin.ts
index 4485da63..51c8d853 100644
--- a/app/server/plugins/moderation/HistoryClearPlugin.ts
+++ b/app/server/plugins/moderation/HistoryClearPlugin.ts
@@ -1,6 +1,6 @@
 import { Connection } from "../../skychat/Connection";
 import { UserController } from "../../skychat/UserController";
-import { RoomPlugin } from "../../skychat/RoomPlugin";
+import { RoomPlugin } from "../RoomPlugin";
 
 
 export class HistoryClearPlugin extends RoomPlugin {
diff --git a/app/server/plugins/moderation/IpPlugin.ts b/app/server/plugins/moderation/IpPlugin.ts
index 79e597f3..71e5672a 100644
--- a/app/server/plugins/moderation/IpPlugin.ts
+++ b/app/server/plugins/moderation/IpPlugin.ts
@@ -5,7 +5,7 @@ import * as striptags from "striptags";
 import {UserController} from "../../skychat/UserController";
 import * as geoip from "geoip-lite";
 import {MessageFormatter} from "../../skychat/MessageFormatter";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 export class IpPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/moderation/KickPlugin.ts b/app/server/plugins/moderation/KickPlugin.ts
index 89ea11d4..1bad241d 100644
--- a/app/server/plugins/moderation/KickPlugin.ts
+++ b/app/server/plugins/moderation/KickPlugin.ts
@@ -1,7 +1,7 @@
 import {Connection} from "../../skychat/Connection";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 /**
diff --git a/app/server/plugins/moderation/MutePlugin.ts b/app/server/plugins/moderation/MutePlugin.ts
index ebf719f3..6d9b2111 100644
--- a/app/server/plugins/moderation/MutePlugin.ts
+++ b/app/server/plugins/moderation/MutePlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
 
diff --git a/app/server/plugins/moderation/OfferMoneyPlugin.ts b/app/server/plugins/moderation/OfferMoneyPlugin.ts
index db8171be..67fabd6e 100644
--- a/app/server/plugins/moderation/OfferMoneyPlugin.ts
+++ b/app/server/plugins/moderation/OfferMoneyPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {Session} from "../../skychat/Session";
 import {User} from "../../skychat/User";
 import {ConnectedListPlugin} from "../core/ConnectedListPlugin";
diff --git a/app/server/plugins/moderation/SetRightPlugin.ts b/app/server/plugins/moderation/SetRightPlugin.ts
index 8f6690f1..8e2c6232 100644
--- a/app/server/plugins/moderation/SetRightPlugin.ts
+++ b/app/server/plugins/moderation/SetRightPlugin.ts
@@ -3,7 +3,7 @@ import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
 import {ConnectedListPlugin} from "../core/ConnectedListPlugin";
 import {UserController} from "../../skychat/UserController";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 
 
 export class SetRightPlugin extends GlobalPlugin {
diff --git a/app/server/plugins/moderation/StickerPlugin.ts b/app/server/plugins/moderation/StickerPlugin.ts
index bcc21a32..7592b714 100644
--- a/app/server/plugins/moderation/StickerPlugin.ts
+++ b/app/server/plugins/moderation/StickerPlugin.ts
@@ -1,5 +1,5 @@
 import {Connection} from "../../skychat/Connection";
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {Server} from "../../skychat/Server";
 import { FileManager } from "../../skychat/FileManager";
 import * as fs from "fs";
diff --git a/app/server/plugins/moderation/TorBanPlugin.ts b/app/server/plugins/moderation/TorBanPlugin.ts
index 29269444..3cbf8696 100644
--- a/app/server/plugins/moderation/TorBanPlugin.ts
+++ b/app/server/plugins/moderation/TorBanPlugin.ts
@@ -2,7 +2,7 @@ import {Connection} from "../../skychat/Connection";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
 import { Room } from "../../skychat/Room";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import fetch from "node-fetch";
 import { RoomManager } from "../../skychat/RoomManager";
 
diff --git a/app/server/plugins/moderation/TrackerPlugin.ts b/app/server/plugins/moderation/TrackerPlugin.ts
index 8935c33b..fbfed081 100644
--- a/app/server/plugins/moderation/TrackerPlugin.ts
+++ b/app/server/plugins/moderation/TrackerPlugin.ts
@@ -1,4 +1,4 @@
-import {GlobalPlugin} from "../../skychat/GlobalPlugin";
+import {GlobalPlugin} from "../GlobalPlugin";
 import {Connection} from "../../skychat/Connection";
 import {Room} from "../../skychat/Room";
 import {Message} from "../../skychat/Message";
diff --git a/app/server/plugins/moderation/UsurpPlugin.ts b/app/server/plugins/moderation/UsurpPlugin.ts
index a7e5fe2d..569ee8a0 100644
--- a/app/server/plugins/moderation/UsurpPlugin.ts
+++ b/app/server/plugins/moderation/UsurpPlugin.ts
@@ -1,7 +1,7 @@
 import {Connection} from "../../skychat/Connection";
 import {User} from "../../skychat/User";
 import {Session} from "../../skychat/Session";
-import { RoomPlugin } from "../../skychat/RoomPlugin";
+import { RoomPlugin } from "../RoomPlugin";
 
 
 /**
@@ -27,7 +27,10 @@ export class UsurpPlugin extends RoomPlugin {
         if (! session || session.connections.length === 0) {
             throw new Error('User ' + identifier + ' does not exist');
         }
-        const command = this.room.getPlugin(commandName);
+        const command = this.room.getPlugin(commandName) || this.room.manager.getPlugin(commandName);
+        if (! command) {
+            throw new Error(`Command ${commandName} does not exist`);
+        }
         await command.run(
             commandName,
             param.split(' ').slice(2).join(' '),
diff --git a/app/server/plugins/optional/AprilFoolsDay.ts b/app/server/plugins/optional/AprilFoolsDay.ts
index c95f3934..72c33d02 100644
--- a/app/server/plugins/optional/AprilFoolsDay.ts
+++ b/app/server/plugins/optional/AprilFoolsDay.ts
@@ -1,5 +1,5 @@
 import { Connection } from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 export class AprilFoolsDay extends GlobalPlugin {
diff --git a/app/server/plugins/optional/LogFuzzerPlugin.ts b/app/server/plugins/optional/LogFuzzerPlugin.ts
index 1f559951..1c634ee6 100644
--- a/app/server/plugins/optional/LogFuzzerPlugin.ts
+++ b/app/server/plugins/optional/LogFuzzerPlugin.ts
@@ -1,7 +1,7 @@
 import { Connection } from "../../skychat/Connection";
 import { DatabaseHelper } from "../../skychat/DatabaseHelper";
 import SQL from "sql-template-strings";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 
 
diff --git a/app/server/plugins/optional/ReminderPlugin.ts b/app/server/plugins/optional/ReminderPlugin.ts
index 6b7f7691..3b539208 100644
--- a/app/server/plugins/optional/ReminderPlugin.ts
+++ b/app/server/plugins/optional/ReminderPlugin.ts
@@ -1,6 +1,6 @@
 import { Connection } from "../../skychat/Connection";
 import { UserController } from "../../skychat/UserController";
-import { RoomPlugin } from "../../skychat/RoomPlugin";
+import { RoomPlugin } from "../RoomPlugin";
 
 
 export class ReminderPlugin extends RoomPlugin {
diff --git a/app/server/plugins/player/PlayerChannel.ts b/app/server/plugins/player/PlayerChannel.ts
index db9a1c1b..58ae04bb 100644
--- a/app/server/plugins/player/PlayerChannel.ts
+++ b/app/server/plugins/player/PlayerChannel.ts
@@ -1,9 +1,9 @@
-import { Config } from "../../skychat/Config";
 import { Connection } from "../../skychat/Connection";
 import { Session } from "../../skychat/Session";
 import { SanitizedUser, User } from "../../skychat/User";
 import { UserController } from "../../skychat/UserController";
 import { PlayerChannelManager } from "./PlayerChannelManager";
+import { PlayerChannelScheduler, SanitizedScheduler, SchedulerEvent } from "./PlayerChannelScheduler";
 
 
 export type QueuedVideoInfo = {
@@ -54,7 +54,11 @@ export type SanitizedPlayerChannel = {
     id: number;
     name: string;
     playing: boolean;
-    currentOwner: string | undefined;
+    currentMedia: {
+        owner: string;
+        title: string;
+    } | undefined;
+    schedule: SanitizedScheduler;
 }
 
 
@@ -68,12 +72,19 @@ export class PlayerChannel {
 
     public readonly manager: PlayerChannelManager;
 
+    public readonly scheduler: PlayerChannelScheduler;
+
     public readonly sessions: Session[] = [];
 
     public queue: QueuedVideoInfo[] = [];
 
     public history: QueuedVideoInfo[] = [];
 
+    /**
+     * Whether this channel is locked (= only OP can interact with it)
+     */
+    public locked: boolean = false;
+
     /**
      * Keeps track of the dates when user last played a media
      */
@@ -87,6 +98,27 @@ export class PlayerChannel {
         this.manager = manager;
         this.id = id;
         this.name = name;
+        this.scheduler = new PlayerChannelScheduler(this);
+    }
+
+    /**
+     * Schedule a media
+     * @param media 
+     * @param start 
+     * @param duration 
+     */
+    public schedule(media: VideoInfo, start: number, duration?: number) {
+        this.scheduler.add(media, start, duration);
+        this.manager.emit('channels-changed', this.manager.channels);
+    }
+
+    /**
+     * Unschedule a media
+     * @param start 
+     */
+    public unschedule(start: number) {
+        this.scheduler.remove(start);
+        this.manager.emit('channels-changed', this.manager.channels);
     }
 
     /**
@@ -237,7 +269,7 @@ export class PlayerChannel {
     }
 
     /**
-     * Return whether a identifier is authroized to manage the player right now
+     * Return whether a identifier is authorized to manage the player right now
      * @param identifier 
      */
     public hasPlayerPermission(session: Session) {
@@ -245,6 +277,10 @@ export class PlayerChannel {
         if (session.isOP()) {
             return true;
         }
+        // If player is locked, no one but OP can modify it
+        if (this.locked) {
+            return false;
+        }
         // If a media is currently playing
         if (this.currentVideoInfo) {
             // Current media owner
@@ -332,14 +368,19 @@ export class PlayerChannel {
     }
 
     /**
-     * What will be sent to the client
+     * What will be sent to the client in the list of channels (All users have this info, even the one not in it)
+     * This object is also saved in the plugin storage
      */
     public sanitized(): SanitizedPlayerChannel {
         return {
             id: this.id,
             name: this.name,
             playing: this.isPlaying(),
-            currentOwner: this.currentVideoInfo ? this.currentVideoInfo.user.username : undefined,
+            currentMedia: this.currentVideoInfo ? {
+                owner: this.currentVideoInfo.user.username,
+                title: this.currentVideoInfo.video.title
+            } : undefined,
+            schedule: this.scheduler.sanitized(),
         };
     }
 }
diff --git a/app/server/plugins/player/PlayerChannelManager.ts b/app/server/plugins/player/PlayerChannelManager.ts
index 833ad088..eddbbfd3 100644
--- a/app/server/plugins/player/PlayerChannelManager.ts
+++ b/app/server/plugins/player/PlayerChannelManager.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from "events";
 import { Connection } from "../../skychat/Connection";
 import { Session } from "../../skychat/Session";
-import { PlayerChannel } from "./PlayerChannel";
+import { PlayerChannel, SanitizedPlayerChannel } from "./PlayerChannel";
 import { PlayerPlugin } from "./PlayerPlugin";
 
 
@@ -37,7 +37,7 @@ export class PlayerChannelManager extends EventEmitter {
      * @param id
      * @param name 
      */
-    public createChannel(id: number, name: string) {
+    public createChannel(id: number, name: string): PlayerChannel {
 
         if (this.getChannelById(id)) {
             throw new Error(`Unable to create existing channel ${id}`);
@@ -46,6 +46,7 @@ export class PlayerChannelManager extends EventEmitter {
         const channel = new PlayerChannel(this, id, name);
         this.channels.push(channel);
         this.emit('channels-changed', this.channels);
+        return channel;
     }
 
     /**
@@ -181,7 +182,7 @@ export class PlayerChannelManager extends EventEmitter {
     /**
      * What will be sent to the client
      */
-    public sanitized(): {id: number, name: string}[] {
+    public sanitized(): SanitizedPlayerChannel[] {
         return this.channels.map(channel => channel.sanitized());
     }
 
diff --git a/app/server/plugins/player/PlayerChannelScheduler.ts b/app/server/plugins/player/PlayerChannelScheduler.ts
new file mode 100644
index 00000000..620d957d
--- /dev/null
+++ b/app/server/plugins/player/PlayerChannelScheduler.ts
@@ -0,0 +1,178 @@
+import { PlayerChannel, VideoInfo } from "./PlayerChannel";
+
+
+export type SchedulerEvent = {
+    start: number;
+    duration: number;
+    media: VideoInfo;
+};
+
+
+export type SanitizedScheduler = {
+    events: SchedulerEvent[];
+};
+
+
+export class PlayerChannelScheduler {
+
+    /**
+     * Default added media duration when none is provided (i.e. for twitch streams)
+     */
+    static readonly DEFAULT_DURATION = 2 * 60 * 60 * 1000;
+
+    /**
+     * List of past events.
+     * An event is considered in the past if its end timestamp is inferior than the current timestamp.
+     * Past events are sorted from oldest to less-old.
+     */
+    private pastEvents: SchedulerEvent[] = [];
+
+    /**
+     * List of future events. This includes event that already started and are still in progress.
+     * Once an event is finished, it is taken away from this list and put in pastEvents.
+     * There may be a delay when past events are still in this list due to the current implementation of the scheduler.
+     * Future events are sorted from nearest to farest.
+     */
+    private futureEvents: SchedulerEvent[] = [];
+
+    /**
+     * Reference to the linked player channel
+     */
+    public readonly playerChannel: PlayerChannel;
+
+    constructor(playerChannel: PlayerChannel) {
+        this.playerChannel = playerChannel;
+
+        setInterval(this.tick.bind(this), 5 * 1000);
+    }
+
+    /**
+     * Get the list of all events
+     */
+    get events(): SchedulerEvent[] {
+        return this.pastEvents.concat(this.futureEvents);
+    }
+
+    /**
+     * 
+     * @param start Start timestamp in ms
+     * @param media Media information
+     * @param duration Duration in ms
+     */
+    add(media: VideoInfo, start: number, duration?: number) {
+        // Check that the duration is ok & build the event object
+        duration = duration || media.duration || PlayerChannelScheduler.DEFAULT_DURATION;
+        const event: SchedulerEvent = { start, duration, media };
+        // Insert the event
+        this.insertEvent(event);
+    }
+
+    /**
+     * Insert an event. Internally put it in the correct list, and already sorted
+     * @param newEvent 
+     */
+    insertEvent(newEvent: SchedulerEvent) {
+        // Check that the time slot is available
+        if (! this.isTimeSlotFree(newEvent.start, newEvent.start + newEvent.duration)) {
+            throw new Error('Time slot is not free');
+        }
+        // Find the list in which to add this event
+        const eventList = newEvent.start + newEvent.duration < new Date().getTime() ? this.pastEvents : this.futureEvents;
+        // Find sorted index in the list where to add this event
+        let index = 0;
+        while (eventList[index] && eventList[index].start + eventList[index].duration < newEvent.start) {
+            ++ index;
+        }
+        eventList.splice(index, 0, newEvent);
+    }
+
+    /**
+     * Remove a scheduled event
+     * @param start 
+     */
+    remove(start: number) {
+        this.pastEvents = this.pastEvents.filter(event => event.start !== start);
+        this.futureEvents = this.futureEvents.filter(event => event.start !== start);
+    }
+
+    /**
+     * @param start Start timestamp in ms
+     * @param end End timestamp in ms
+     * @returns whether a time slot is free or not
+     */
+    isTimeSlotFree(start: number, end: number): boolean {
+        const conflictingEvent = this.events.find(event => {
+            // start < e.start < end
+            //      [    ]  : existing event
+            //   [    ]     : new slot
+            if (start < event.start && event.start < end) {
+                return true;
+            }
+            // start < e.end < end
+            // [    ]       : existing event
+            //    [    ]    : new slot
+            if (start < event.start + event.duration && event.start + event.duration < end) {
+                return true;
+            }
+            // e.start < start < end < e.end
+            // [       ]    : existing event
+            //   [  ]       : new slot
+            if (event.start < start && end < event.start + event.duration) {
+                return true;
+            }
+            return false;
+        });
+        return ! conflictingEvent;
+    }
+
+    /**
+     * Tick method
+     */
+    tick(): void {
+        // Build the current state of the channel
+        let currentEvent: SchedulerEvent | null = null;
+        // Get next event in list
+        const nextEvent = this.futureEvents[0] || null;
+        // If there is no event currently on, wait for the next tick
+        if (! nextEvent) {
+            // If there is no event to play next
+
+        } else if (nextEvent.start > new Date().getTime()) {
+            // If the event to play next as not yet started
+
+        } else if (nextEvent.start + nextEvent.duration < new Date().getTime()) {
+            // If current event has just finished, move the finished event in the list of past events
+            this.pastEvents.push(this.futureEvents.shift() as SchedulerEvent);
+        
+        } else {
+            // An event is currently in progress
+            currentEvent = nextEvent;
+
+        }
+
+        // If there is an event in progress, but the channel is not playing it
+        if (currentEvent && (! this.playerChannel.currentVideoInfo || this.playerChannel.currentVideoInfo.video.id !== currentEvent.media.id)) {
+            // Empty the channel queue
+            this.playerChannel.locked = true;
+            this.playerChannel.flushQueue();
+            this.playerChannel.add(currentEvent.media);
+        }
+
+        // If there is not event in progress but the channel is still locked
+        if (! currentEvent && this.playerChannel.locked) {
+            this.playerChannel.flushQueue();
+            this.playerChannel.skip();
+            this.playerChannel.locked = false;
+        }
+    }
+
+    /**
+     * Returns all the past and future events, sorted by date
+     * @returns 
+     */
+    sanitized(): SanitizedScheduler {
+        return {
+            events: this.events,
+        }
+    }
+}
diff --git a/app/server/plugins/player/PlayerPlugin.ts b/app/server/plugins/player/PlayerPlugin.ts
index b0dedc84..0a0221b5 100644
--- a/app/server/plugins/player/PlayerPlugin.ts
+++ b/app/server/plugins/player/PlayerPlugin.ts
@@ -1,13 +1,16 @@
 import { Connection } from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { RoomManager } from "../../skychat/RoomManager";
 import { PlayerChannelManager } from "./PlayerChannelManager";
 import { YoutubeFetcher } from "./fetcher/YoutubeFetcher";
-import { PluginCommandRules } from "../../skychat/Plugin";
+import { PluginCommandRules } from "../Plugin";
 import { LinkFetcher } from "./fetcher/LinkFetcher";
 import { VideoFetcher } from "./fetcher/VideoFetcher";
 import { TwitchFetcher } from "./fetcher/TwitchFetcher";
 import { PollPlugin } from "../poll/PollPlugin";
+import { SanitizedPlayerChannel } from "./PlayerChannel";
+import { Session } from "../../skychat/Session";
+import { Config } from "../../skychat/Config";
 
 
 
@@ -16,8 +19,6 @@ import { PollPlugin } from "../poll/PollPlugin";
  */
 export class PlayerPlugin extends GlobalPlugin {
 
-    static readonly MIN_RIGHT: number = 10;
-
     static readonly FETCHERS: {[fetcherName: string]: VideoFetcher} = {
         'yt': new YoutubeFetcher(),
         'twitch': new TwitchFetcher(),
@@ -30,7 +31,9 @@ export class PlayerPlugin extends GlobalPlugin {
         'playerchannelmanage',
         'playerchannel',
         'playersync',
-        'playersearch'
+        'playersearch',
+        'schedule',
+        'unschedule',
     ].concat(Object.keys(PlayerPlugin.FETCHERS));
 
     static readonly defaultDataStorageValue: { channel: null | number; } = { channel: null };
@@ -74,9 +77,30 @@ export class PlayerPlugin extends GlobalPlugin {
                 {name: 'search', pattern: /./},
             ]
         },
+        schedule: {
+            minCount: 2,
+            maxCount: 4,
+            coolDown: 500,
+            maxCallsPer10Seconds: 2,
+            params: [
+                { name: 'type', pattern: new RegExp(`^${Object.keys(PlayerPlugin.FETCHERS).join('|')}$`) },
+                { name: 'param', pattern: /./ },
+                { name: 'startDate', pattern: /^([0-9]{4})-([0-9]{2})-([0-9]{2})[T ]([0-9]{2}):([0-9]{2})(:[0-9]{2}(\.[0-9]{3}Z)?)?$/ },
+                { name: 'duration', pattern: /^\d+$/ },
+            ]
+        },
+        unschedule: {
+            minCount: 1,
+            maxCount: 1,
+            coolDown: 500,
+            maxCallsPer10Seconds: 2,
+            params: [
+                { name: 'start', pattern: /^\d+$/ },
+            ]
+        },
     };
 
-    protected storage: { channels: {id: number; name: string}[] } = {
+    protected storage: { channels: SanitizedPlayerChannel[] } = {
         channels: []
     };
 
@@ -99,10 +123,13 @@ export class PlayerPlugin extends GlobalPlugin {
         this.loadStorage();
 
         this.channelManager = new PlayerChannelManager(this);
-        for (const channel of this.storage.channels) {
-            this.channelManager.createChannel(channel.id, channel.name);
+        for (const channelData of this.storage.channels) {
+            const channel = this.channelManager.createChannel(channelData.id, channelData.name);
+            for (const event of channelData.schedule.events) {
+                channel.schedule(event.media, event.start, event.duration);
+            }
         }
-
+        
         // Bind events
         this.channelManager.on('channels-changed', () => {
             this.storage.channels = this.channelManager.sanitized();
@@ -110,45 +137,6 @@ export class PlayerPlugin extends GlobalPlugin {
         });
     }
 
-    /**
-     * @hook When a connection is created, send to this connection the list of channels
-     * @param connection
-     */
-    public async onNewConnection(connection: Connection): Promise<void> {
-        this.channelManager.sync([connection]);
-    }
-
-    /**
-     * @hook When a connection is closed, cleanup the session if required
-     * @param connection
-     */
-    public async onConnectionClosed(connection: Connection): Promise<void> {
-        if (connection.session.connections.length === 0) {
-            this.channelManager.leaveChannel(connection.session);
-        }
-    }
-
-    /**
-     * @hook When a connection successfully authenticated, make him join its channel
-     * @param connection
-     */
-    public async onConnectionAuthenticated(connection: Connection): Promise<void> {
-        // Compare the saved channel id to this session
-        const currentChannel = this.channelManager.getSessionChannel(connection.session);
-        const savedChannelId = this.getUserData(connection.session.user);
-
-        if (typeof savedChannelId === 'number' && (! currentChannel || savedChannelId !== currentChannel.id)) {
-            // If the user is supposed to be in a channel, but this session aint
-            // Make this session join the saved channel
-            this.channelManager.joinChannel(connection.session, savedChannelId);
-
-        } else if (currentChannel) {
-            // If this session is in a yt channel, synchronize this connection
-            connection.send('player-channel', currentChannel.id);
-            currentChannel.syncConnections([connection]);
-        }
-    }
-
     /**
      * Plugin entry point
      */
@@ -181,12 +169,42 @@ export class PlayerPlugin extends GlobalPlugin {
             case 'playersearch':
                 await this.handlePlayerSearch(param, connection);
                 break;
+
+            case 'schedule':
+                await this.handlePlayerSchedule(param, connection);
+                break;
+
+            case 'unschedule':
+                await this.handlePlayerUnschedule(param, connection);
+                break;
             
             default:
                 throw new Error('Unsupported action');
         }
     }
 
+    /**
+     * Return whether a session has the right to play a media
+     * @param session 
+     * @returns 
+     */
+    public canAddMedia(session: Session) {
+        const expectedRight = Config.PREFERENCES.minRightForPlayerAddMedia === 'op' ? Infinity : Config.PREFERENCES.minRightForPlayerAddMedia;
+        const actualRight = session.isOP() ? Infinity : session.user.right;
+        return actualRight >= expectedRight;
+    }
+
+    /**
+     * Return whether a session has the right to manage the schedule
+     * @param session 
+     * @returns 
+     */
+    public canSchedule(session: Session) {
+        const expectedRight = Config.PREFERENCES.minRightForPlayerManageSchedule === 'op' ? Infinity : Config.PREFERENCES.minRightForPlayerManageSchedule;
+        const actualRight = session.isOP() ? Infinity : session.user.right;
+        return actualRight >= expectedRight;
+    }
+
     /**
      * Manage channels (Only for OP)
      * @param param 
@@ -287,7 +305,7 @@ export class PlayerPlugin extends GlobalPlugin {
      * @returns 
      */
     private async handlePlayerSearch(param: string, connection: Connection) {
-        if (connection.session.user.right < PlayerPlugin.MIN_RIGHT) {
+        if (! this.canAddMedia(connection.session)) {
             throw new Error('Unable to perform this action');
         }
         const fetcherName = param.split(' ')[0];
@@ -300,6 +318,62 @@ export class PlayerPlugin extends GlobalPlugin {
         const items = await fetcher.search(this, type, search, 10);
         connection.send('player-search', { type, items });
     }
+    
+    /**
+     * Schedule a video to play
+     * @param param 
+     * @param connection 
+     * @returns 
+     */
+    private async handlePlayerSchedule(param: string, connection: Connection) {
+        if (! this.canSchedule(connection.session)) {
+            throw new Error('You do not have the permission to schedule medias');
+        }
+        const channel = this.channelManager.getSessionChannel(connection.session);
+        if (! channel) {
+            throw new Error('Join a channel to add videos');
+        }
+        // Get & verify params
+        const [fetcherName, id, rawStart, rawDuration] = param.split(' ');
+        const fetcher = PlayerPlugin.FETCHERS[fetcherName];
+        const start = rawStart ? new Date(rawStart) : new Date();
+        const duration: number | null = parseInt(rawDuration) || null;
+        if (typeof fetcher === 'undefined') {
+            throw new Error('Invalid fetcher specified');
+        }
+        if (start.toJSON() === null) {
+            throw new Error('Invalid date');
+        }
+        const medias = await fetcher.get(this, id);
+        if (medias.length === 0) {
+            throw new Error('No media found');
+        }
+        // Only add the first media
+        const media = medias[0];
+        channel.schedule(media, start.getTime(), duration || media.duration);
+    }
+    
+    /**
+     * Unschedule a media
+     * @param param 
+     * @param connection 
+     * @returns 
+     */
+    private async handlePlayerUnschedule(param: string, connection: Connection) {
+        if (! this.canSchedule(connection.session)) {
+            throw new Error('Unable to perform this action');
+        }
+        const channel = this.channelManager.getSessionChannel(connection.session);
+        if (! channel) {
+            throw new Error('Join a channel to add videos');
+        }
+        // Get & verify params
+        const start = parseInt(param.split(' ')[0]);
+        if (! start) {
+            throw new Error('Invalid date');
+        }
+        channel.unschedule(start);
+    }
 
     /**
      * Add a video to the queue
@@ -308,13 +382,16 @@ export class PlayerPlugin extends GlobalPlugin {
      * @returns 
      */
     private async handlePlayerFetch(fetcherName: string, param: string, connection: Connection) {
-        if (connection.session.user.right < PlayerPlugin.MIN_RIGHT) {
+        if (! this.canAddMedia(connection.session)) {
             throw new Error('Unable to perform this action');
         }
         const channel = this.channelManager.getSessionChannel(connection.session);
         if (! channel) {
             throw new Error('Join a channel to add videos');
         }
+        if (channel.locked && ! connection.session.isOP()) {
+            throw new Error('Channel is locked');
+        }
         if (typeof PlayerPlugin.FETCHERS[fetcherName] === 'undefined') {
             throw new Error('Invalid fetcher specified');
         }
@@ -338,6 +415,9 @@ export class PlayerPlugin extends GlobalPlugin {
         if (! channel) {
             throw new Error('Channel does not exist');
         }
+        if (channel.locked && ! connection.session.isOP()) {
+            throw new Error('Channel is locked');
+        }
 
         switch (param) {
 
@@ -390,4 +470,43 @@ export class PlayerPlugin extends GlobalPlugin {
                 break;
         }
     }
+
+    /**
+     * @hook When a connection is created, send to this connection the list of channels
+     * @param connection
+     */
+    public async onNewConnection(connection: Connection): Promise<void> {
+        this.channelManager.sync([connection]);
+    }
+
+    /**
+     * @hook When a connection is closed, cleanup the session if required
+     * @param connection
+     */
+    public async onConnectionClosed(connection: Connection): Promise<void> {
+        if (connection.session.connections.length === 0) {
+            this.channelManager.leaveChannel(connection.session);
+        }
+    }
+
+    /**
+     * @hook When a connection successfully authenticated, make him join its channel
+     * @param connection
+     */
+    public async onConnectionAuthenticated(connection: Connection): Promise<void> {
+        // Compare the saved channel id to this session
+        const currentChannel = this.channelManager.getSessionChannel(connection.session);
+        const savedChannelId = this.getUserData(connection.session.user);
+
+        if (typeof savedChannelId === 'number' && (! currentChannel || savedChannelId !== currentChannel.id)) {
+            // If the user is supposed to be in a channel, but this session aint
+            // Make this session join the saved channel
+            this.channelManager.joinChannel(connection.session, savedChannelId);
+
+        } else if (currentChannel) {
+            // If this session is in a yt channel, synchronize this connection
+            connection.send('player-channel', currentChannel.id);
+            currentChannel.syncConnections([connection]);
+        }
+    }
 }
diff --git a/app/server/plugins/player/YoutubeSearchAndPlayPlugin.ts b/app/server/plugins/player/YoutubeSearchAndPlayPlugin.ts
index 64d55d55..e83d1c39 100644
--- a/app/server/plugins/player/YoutubeSearchAndPlayPlugin.ts
+++ b/app/server/plugins/player/YoutubeSearchAndPlayPlugin.ts
@@ -1,7 +1,7 @@
 import { Connection } from "../../skychat/Connection";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 import { PlayerPlugin } from "./PlayerPlugin";
-import { PluginCommandRules } from "../../skychat/Plugin";
+import { PluginCommandRules } from "../Plugin";
 import { YoutubeFetcher } from "./fetcher/YoutubeFetcher";
 
 
@@ -23,7 +23,8 @@ export class YoutubeSearchAndPlayPlugin extends GlobalPlugin {
     
     public async run(alias: string, param: string, connection: Connection) {
         
-        if (connection.session.user.right < PlayerPlugin.MIN_RIGHT) {
+        const plugin = this.manager.getPlugin('player') as PlayerPlugin;
+        if (! plugin.canAddMedia(connection.session)) {
             throw new Error('Unable to perform this action');
         }
 
diff --git a/app/server/plugins/player/fetcher/LinkFetcher.ts b/app/server/plugins/player/fetcher/LinkFetcher.ts
index 33b13fe2..7f4a226d 100644
--- a/app/server/plugins/player/fetcher/LinkFetcher.ts
+++ b/app/server/plugins/player/fetcher/LinkFetcher.ts
@@ -28,17 +28,20 @@ export class LinkFetcher implements VideoFetcher {
         const duration = await FileManager.getVideoDuration(localPath);
         // If file coming from the gallery, get the associated media
         let title = `Media.${extension}`;
+        let thumb: string | undefined = undefined;
         if (FileManager.isFileUrlInGallery(link) && playerPlugin.manager.getPlugin('gallery')) {
             const gallery = (playerPlugin.manager.getPlugin('gallery') as GalleryPlugin).gallery;
             const media = gallery.getMediaFromUrl(link);
             if (media) {
                 title = media.tags.join(' ') + '.' + extension;
+                thumb = media.thumb;
             }
         }
         return {
             type: 'embed',
             id: localPath,
             startCursor: 0,
+            thumb,
             duration,
             title,
         };
diff --git a/app/server/plugins/player/fetcher/VideoFetcher.ts b/app/server/plugins/player/fetcher/VideoFetcher.ts
index 80cb6859..f13b7bf9 100644
--- a/app/server/plugins/player/fetcher/VideoFetcher.ts
+++ b/app/server/plugins/player/fetcher/VideoFetcher.ts
@@ -2,8 +2,20 @@ import { VideoInfo } from "../PlayerChannel";
 import { PlayerPlugin } from "../PlayerPlugin";
 
 export interface VideoFetcher {
-    
+
+    /**
+     * Get a media
+     * @param playerPlugin 
+     * @param param 
+     */
     get(playerPlugin: PlayerPlugin, param: string): Promise<VideoInfo[]>;
 
+    /**
+     * Advanced media search
+     * @param playerPlugin 
+     * @param type 
+     * @param search 
+     * @param limit 
+     */
     search(playerPlugin: PlayerPlugin, type: string, search: string, limit: number): Promise<VideoInfo[]>;
 }
diff --git a/app/server/plugins/poll/PollPlugin.ts b/app/server/plugins/poll/PollPlugin.ts
index 57f04ad5..9eedf5a1 100644
--- a/app/server/plugins/poll/PollPlugin.ts
+++ b/app/server/plugins/poll/PollPlugin.ts
@@ -1,8 +1,8 @@
 import { Connection } from "../../skychat/Connection";
-import { Plugin } from "../../skychat/Plugin";
+import { Plugin } from "../Plugin";
 import { Poll, PollOptions } from "./Poll";
 import { Config } from "../../skychat/Config";
-import { GlobalPlugin } from "../../skychat/GlobalPlugin";
+import { GlobalPlugin } from "../GlobalPlugin";
 
 
 
diff --git a/app/server/skychat/Config.ts b/app/server/skychat/Config.ts
index 6f9de5f0..d00fffa2 100644
--- a/app/server/skychat/Config.ts
+++ b/app/server/skychat/Config.ts
@@ -8,14 +8,17 @@ export type Preferences = {
     minRightForAudioRecording: number;
     minRightForConnectedList: number;
     minRightForPolls: number;
-    minRightForGallery: number;
+    minRightForGalleryRead: number | 'op';
+    minRightForGalleryWrite: number | 'op';
+    minRightForPlayerAddMedia: number | 'op';
+    minRightForPlayerManageSchedule: number | 'op';
     maxReplacedImagesPerMessage: number;
     maxReplacedStickersPerMessage: number;
     maxNewlinesPerMessage: number;
 }
 
 export type PublicConfig = {
-    ranks: {limit: number, images: {[size: string]: string}}[],
+    ranks: { limit: number, images: { [size: string]: string } }[];
 }
 
 export class Config {
@@ -50,7 +53,7 @@ export class Config {
 
     public static FAKE_MESSAGES: string[] = [];
 
-    public static RANKS: {limit: number, images: {[size: string]: string}}[] = [];
+    public static RANKS: { limit: number, images: { [size: string]: string } }[] = [];
 
     public static PLUGINS: string[] = [];
 
@@ -139,7 +142,10 @@ export class Config {
             'minRightForAudioRecording',
             'minRightForConnectedList',
             'minRightForPolls',
-            'minRightForGallery',
+            'minRightForGalleryRead',
+            'minRightForGalleryWrite',
+            'minRightForPlayerAddMedia',
+            'minRightForPlayerManageSchedule',
             'maxReplacedImagesPerMessage',
             'maxReplacedStickersPerMessage',
             'maxNewlinesPerMessage'
diff --git a/app/server/skychat/FileManager.ts b/app/server/skychat/FileManager.ts
index b5ef8c69..77eef388 100644
--- a/app/server/skychat/FileManager.ts
+++ b/app/server/skychat/FileManager.ts
@@ -9,8 +9,12 @@ import { ShellHelper } from "./ShellHelper";
 
 export class FileManager {
 
-    static saveFile(file: fileUpload.UploadedFile): string {
+    static getNewFileLocation(extension: string): string {
         const date = new Date();
+        return 'uploads/all/' + date.toISOString().substr(0, 19).replace(/(-|T)/g, '/').replace(/:/g, '-') + '-' + Math.floor(1000000000 * RandomGenerator.random(8)) + '.' + extension;
+    }
+
+    static saveFile(file: fileUpload.UploadedFile): string {
         const mimeTypes: {[mimetype: string]: string} = {
             'image/jpeg': 'jpg',
             'image/jpg': 'jpg',
@@ -18,23 +22,24 @@ export class FileManager {
             'image/gif': 'gif',
             'application/pdf': 'pdf',
             'video/mp4': 'mp4',
+            'video/mkv': 'mkv',
             'video/webm': 'webm',
         };
         if (typeof mimeTypes[file.mimetype] === 'undefined') {
             throw new Error('Invalid mimetype');
         }
         const extension = mimeTypes[file.mimetype];
-        const filePath = 'uploads/all/' + date.toISOString().substr(0, 19).replace(/(-|T)/g, '/').replace(/:/g, '-') + '-' + Math.floor(1000000000 * RandomGenerator.random(8)) + '.' + extension;
+        const filePath = FileManager.getNewFileLocation(extension);
         file.mv(filePath);
         return filePath;
     }
 
     static isFileUrlUploaded(fileUrl: string): boolean {
-        return !! fileUrl.match(new RegExp('^' + MessageFormatter.escapeRegExp(Config.LOCATION + '/uploads/all/') + '([0-9a-zA-Z/-]+)\\.(jpg|jpeg|png|webp|gif|pdf|mp4|webm)$'));
+        return !! fileUrl.match(new RegExp('^' + MessageFormatter.escapeRegExp(Config.LOCATION + '/uploads/all/') + '([0-9a-zA-Z/-]+)\\.(jpg|jpeg|png|webp|gif|pdf|mp4|mkv|webm)$'));
     }
 
     static isFileUrlInGallery(fileUrl: string): boolean {
-        return !! fileUrl.match(new RegExp('^' + MessageFormatter.escapeRegExp(Config.LOCATION + '/uploads/gallery/') + '([0-9]+)/([0-9]+)/([0-9]+)/([0-9a-z-]+)\\.(jpg|jpeg|png|webp|gif|pdf|mp4|webm)$'));
+        return !! fileUrl.match(new RegExp('^' + MessageFormatter.escapeRegExp(Config.LOCATION + '/uploads/gallery/') + '([0-9]+)/([0-9]+)/([0-9]+)/([0-9a-z-]+)\\.(jpg|jpeg|png|webp|gif|pdf|mp4|mkv|webm)$'));
     }
 
     static uploadedFileExists(fileUrl: string): boolean {
@@ -45,6 +50,23 @@ export class FileManager {
         return '.' + url.substr(Config.LOCATION.length).split('?')[0];
     }
 
+    static getFileUrlFromLocalPath(path: string): string {
+        // Remove the leading '.' if there is one
+        if (path.substr(0, 1) === '.') {
+            path = path.substr(1);
+        }
+        // Add the first slash if it is missing
+        if (path.substr(0, 1) !== '/') {
+            path = '/' + path;
+        }
+        return Config.LOCATION + path;
+    }
+
+    static getFileDirectory(path: string): string {
+        const dir = path.substr(0, path.lastIndexOf('/'));
+        return dir.length === 0 ? '.' : dir;
+    }
+
     /**
      * Get a locally stored video duration in ms
      * @param path 
diff --git a/app/server/skychat/PluginManager.ts b/app/server/skychat/PluginManager.ts
index 2f0179d8..5cb98f4f 100644
--- a/app/server/skychat/PluginManager.ts
+++ b/app/server/skychat/PluginManager.ts
@@ -1,7 +1,7 @@
 import { Room } from "./Room";
 import { Config } from "./Config";
-import { RoomPlugin } from "./RoomPlugin";
-import { GlobalPlugin } from "./GlobalPlugin";
+import { RoomPlugin } from "../plugins/RoomPlugin";
+import { GlobalPlugin } from "../plugins/GlobalPlugin";
 import { RoomManager } from "./RoomManager";
 const impl = require('../plugins');
 
diff --git a/app/server/skychat/Room.ts b/app/server/skychat/Room.ts
index 2045d89e..617e328a 100644
--- a/app/server/skychat/Room.ts
+++ b/app/server/skychat/Room.ts
@@ -1,7 +1,7 @@
 import {Connection} from "./Connection";
 import {IBroadcaster} from "./IBroadcaster";
 import {Message, MessageConstructorOptions} from "./Message";
-import {Plugin} from "./Plugin";
+import {Plugin} from "../plugins/Plugin";
 import {PluginManager} from "./PluginManager";
 import * as fs from "fs";
 import SQL from "sql-template-strings";
@@ -9,7 +9,7 @@ import {DatabaseHelper} from "./DatabaseHelper";
 import { MessageController } from "./MessageController";
 import { Config } from "./Config";
 import { RoomManager } from "./RoomManager";
-import { RoomPlugin } from "./RoomPlugin";
+import { RoomPlugin } from "../plugins/RoomPlugin";
 import { AudioRecorderPlugin } from "../plugins/core/AudioRecorderPlugin";
 import { ConnectedListPlugin } from "../plugins/core/ConnectedListPlugin";
 import { MessageEditPlugin } from "../plugins/core/MessageEditPlugin";
@@ -332,12 +332,8 @@ export class Room implements IBroadcaster {
      * Get a plugin instance by its name
      * @param name
      */
-    public getPlugin(name: string): Plugin {
-        const plugin: Plugin | undefined = this.commands[name];
-        if (! plugin) {
-            throw new Error('Plugin not found');
-        }
-        return plugin;
+    public getPlugin(name: string): Plugin | undefined {
+        return this.commands[name];
     }
     
     /**
diff --git a/app/server/skychat/RoomManager.ts b/app/server/skychat/RoomManager.ts
index 64c65822..826485c8 100644
--- a/app/server/skychat/RoomManager.ts
+++ b/app/server/skychat/RoomManager.ts
@@ -12,7 +12,7 @@ import * as fs from "fs";
 import {Message} from "./Message";
 import {AudioRecorderPlugin} from "../plugins/core/AudioRecorderPlugin";
 import { PluginManager } from "./PluginManager";
-import { GlobalPlugin } from "./GlobalPlugin";
+import { GlobalPlugin } from "../plugins/GlobalPlugin";
 
 
 export type StoredSkyChat = {
@@ -262,7 +262,7 @@ export class RoomManager {
             throw new Error(`Room ${id} not found`);
         }
         // Move all connections to another room
-        const anyRoom: Room = this.rooms.find(room => room.id !== id) as Room;
+        const anyRoom: Room = this.rooms.find(room => room.id !== id && ! room.isPrivate) as Room;
         for (const connection of anyRoom.connections) {
             await anyRoom.attachConnection(connection);
         }
@@ -394,6 +394,11 @@ export class RoomManager {
         if (! room) {
             throw new Error('Invalid room specified');
         }
+        if (room.isPrivate) {
+            if (room.whitelist.indexOf(connection.session.identifier) === -1) {
+                throw new Error('You are not allowed to join this room');
+            }
+        }
         await room.attachConnection(connection);
     }
 
@@ -422,9 +427,11 @@ export class RoomManager {
         }
         connection.send('auth-token', UserController.getAuthToken(user.id));
         this.sendRoomList(connection);
-        const room = this.rooms[0];
-        await room.attachConnection(connection);
-        await this.executeConnectionAuthenticatedHook(connection);
+        const room = this.rooms.find(room => ! room.isPrivate);
+        if (room) {
+            await room.attachConnection(connection);
+            await this.executeConnectionAuthenticatedHook(connection);
+        }
     }
 
     /**
diff --git a/app/server/skychat/Session.ts b/app/server/skychat/Session.ts
index 5bf96110..d41ff093 100644
--- a/app/server/skychat/Session.ts
+++ b/app/server/skychat/Session.ts
@@ -97,6 +97,22 @@ export class Session implements IBroadcaster {
         Session.connections.forEach(connection => connection.send(event, payload));
     }
 
+    /**
+     * Send an info message to all connected connections
+     * @param message
+     */
+    public sendInfo(message: string): void {
+        this.connections.forEach(c => c.sendInfo(message));
+    }
+
+    /**
+     * Send an error to all connected connections
+     * @param error
+     */
+    public sendError(error: Error): void {
+        this.connections.forEach(c => c.sendError(error));
+    }
+
     public static cleanUpInterval = setInterval(Session.cleanUpAllSessions, 5 * 1000);
 
     /**
diff --git a/config/preferences.json.template b/config/preferences.json.template
index 2884ed2c..a121e081 100644
--- a/config/preferences.json.template
+++ b/config/preferences.json.template
@@ -4,7 +4,10 @@
     "minRightForAudioRecording": -1,
     "minRightForConnectedList": -1,
     "minRightForPolls": -1,
-    "minRightForGallery": -1,
+    "minRightForGalleryRead": 0,
+    "minRightForGalleryWrite": "op",
+    "minRightForPlayerAddMedia": 0,
+    "minRightForPlayerManageSchedule": "op",
     "maxReplacedImagesPerMessage": 50,
     "maxReplacedStickersPerMessage": 50,
     "maxNewlinesPerMessage": 20
diff --git a/package-lock.json b/package-lock.json
index 7cf5e923..3aa45dc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
             "version": "0.0.1",
             "license": "ISC",
             "dependencies": {
+                "@toast-ui/vue-calendar": "^1.1.1",
                 "biguint-format": "^1.0.2",
                 "escape-html": "^1.0.3",
                 "events": "^3.1.0",
@@ -72,6 +73,17 @@
                 "webpack-stream": "^5.2.1"
             }
         },
+        "node_modules/@toast-ui/vue-calendar": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@toast-ui/vue-calendar/-/vue-calendar-1.1.1.tgz",
+            "integrity": "sha512-2tjZabw7DJtexST9P0nYkjWPD74lDw0nO5F0B5/nTuu/KwiOnNcxsGtJYGEJHVajeY17vSvZWjMZg2fihXWGWw==",
+            "dependencies": {
+                "tui-calendar": "^1.11.0"
+            },
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
+        },
         "node_modules/@types/babel-types": {
             "version": "7.0.4",
             "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz",
@@ -12728,6 +12740,34 @@
             "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
             "dev": true
         },
+        "node_modules/tui-calendar": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/tui-calendar/-/tui-calendar-1.13.1.tgz",
+            "integrity": "sha512-6d+/JMQyPK4fAudrbsUClIAPsjZqPoY4xrYP7d624Ix2bAkmVbFpnp6UHaBVO7wHOEh6BVzoN88sUiZPcMY8rA==",
+            "dependencies": {
+                "tui-code-snippet": "^1.5.0",
+                "tui-date-picker": "^4.0.2",
+                "tui-time-picker": "^2.0.1"
+            }
+        },
+        "node_modules/tui-code-snippet": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/tui-code-snippet/-/tui-code-snippet-1.5.2.tgz",
+            "integrity": "sha512-6UqTlQaaC1KLcmC0HAoq5dtl1G4Fib+R+NC7pmaV7kiIlZ7JqKhUmnOoGRcreAyzd81UTK/vCvhrw9QJskpCFQ=="
+        },
+        "node_modules/tui-date-picker": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/tui-date-picker/-/tui-date-picker-4.2.2.tgz",
+            "integrity": "sha512-K7EzGMNTz7Q5RAbe++jWjIRtx2KooABrmS0IhttHz2t/RyVoxZ01Mw7J1f6EP0ytF2wHrnjHMXixqEy4Shbu3g==",
+            "dependencies": {
+                "tui-time-picker": "^2.1.2"
+            }
+        },
+        "node_modules/tui-time-picker": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/tui-time-picker/-/tui-time-picker-2.1.2.tgz",
+            "integrity": "sha512-vrdPUmPu8o700C08XlJMb+GjpkkgLjiO7rTn/r3d6LWnFo3K0rMPkevEsDaRUMDjCdslTXERYHMDAtevZHr6jQ=="
+        },
         "node_modules/tunnel-agent": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -13599,8 +13639,7 @@
         "node_modules/vue": {
             "version": "2.6.11",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-            "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==",
-            "dev": true
+            "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
         },
         "node_modules/vue-hot-reload-api": {
             "version": "2.3.4",
@@ -14716,6 +14755,14 @@
         }
     },
     "dependencies": {
+        "@toast-ui/vue-calendar": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@toast-ui/vue-calendar/-/vue-calendar-1.1.1.tgz",
+            "integrity": "sha512-2tjZabw7DJtexST9P0nYkjWPD74lDw0nO5F0B5/nTuu/KwiOnNcxsGtJYGEJHVajeY17vSvZWjMZg2fihXWGWw==",
+            "requires": {
+                "tui-calendar": "^1.11.0"
+            }
+        },
         "@types/babel-types": {
             "version": "7.0.4",
             "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz",
@@ -25395,6 +25442,34 @@
             "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
             "dev": true
         },
+        "tui-calendar": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/tui-calendar/-/tui-calendar-1.13.1.tgz",
+            "integrity": "sha512-6d+/JMQyPK4fAudrbsUClIAPsjZqPoY4xrYP7d624Ix2bAkmVbFpnp6UHaBVO7wHOEh6BVzoN88sUiZPcMY8rA==",
+            "requires": {
+                "tui-code-snippet": "^1.5.0",
+                "tui-date-picker": "^4.0.2",
+                "tui-time-picker": "^2.0.1"
+            }
+        },
+        "tui-code-snippet": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/tui-code-snippet/-/tui-code-snippet-1.5.2.tgz",
+            "integrity": "sha512-6UqTlQaaC1KLcmC0HAoq5dtl1G4Fib+R+NC7pmaV7kiIlZ7JqKhUmnOoGRcreAyzd81UTK/vCvhrw9QJskpCFQ=="
+        },
+        "tui-date-picker": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/tui-date-picker/-/tui-date-picker-4.2.2.tgz",
+            "integrity": "sha512-K7EzGMNTz7Q5RAbe++jWjIRtx2KooABrmS0IhttHz2t/RyVoxZ01Mw7J1f6EP0ytF2wHrnjHMXixqEy4Shbu3g==",
+            "requires": {
+                "tui-time-picker": "^2.1.2"
+            }
+        },
+        "tui-time-picker": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/tui-time-picker/-/tui-time-picker-2.1.2.tgz",
+            "integrity": "sha512-vrdPUmPu8o700C08XlJMb+GjpkkgLjiO7rTn/r3d6LWnFo3K0rMPkevEsDaRUMDjCdslTXERYHMDAtevZHr6jQ=="
+        },
         "tunnel-agent": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -26137,8 +26212,7 @@
         "vue": {
             "version": "2.6.11",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-            "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==",
-            "dev": true
+            "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
         },
         "vue-hot-reload-api": {
             "version": "2.3.4",
diff --git a/package.json b/package.json
index 16898b52..19c36a25 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
+        "@toast-ui/vue-calendar": "^1.1.1",
         "biguint-format": "^1.0.2",
         "escape-html": "^1.0.3",
         "events": "^3.1.0",