diff --git a/Dockerfile b/Dockerfile
index 3ba4b6a..17892cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,8 @@ RUN \
 	/tmp/opt/emby-server/system/* \
 	/tmp/opt/emby-server/lib/* \
 	/tmp/opt/emby-server/bin/ff* \
-	/tmp/opt/emby-server/etc
+	/tmp/opt/emby-server/etc \
+	/tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 19c0437..86c7830 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -29,7 +29,8 @@ RUN \
 	/tmp/opt/emby-server/system/* \
 	/tmp/opt/emby-server/lib/* \
 	/tmp/opt/emby-server/bin/ff* \
-	/tmp/opt/emby-server/etc
+	/tmp/opt/emby-server/etc \
+	/tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index acd16fd..f919981 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -29,7 +29,8 @@ RUN \
 	/tmp/opt/emby-server/system/* \
 	/tmp/opt/emby-server/lib/* \
 	/tmp/opt/emby-server/bin/ff* \
-	/tmp/opt/emby-server/etc
+	/tmp/opt/emby-server/etc \
+	/tmp/opt/emby-server/extra/lib/*
 
 # runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
diff --git a/README.md b/README.md
index 3085130..a66fccd 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Find us at:
 
 [Emby](https://emby.media/) organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone emby Media Server.
 
-[![emby](https://emby.media/community/uploads/inline/3/55626b855503c_logo800.png)](https://emby.media/)
+[![emby](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/emby-logo.png)](https://emby.media/)
 
 ## Supported Architectures
 
@@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.05.21:** - Structural changes upstream.
 * **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode.
 * **21.12.20:** - Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf.
 * **03.11.20:** - Fix issue with missing samba folder.
diff --git a/readme-vars.yml b/readme-vars.yml
index e74e4f8..f575db6 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -3,7 +3,7 @@
 # project information
 project_name: emby
 project_url: "https://emby.media/"
-project_logo: "https://emby.media/community/uploads/inline/3/55626b855503c_logo800.png"
+project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/emby-logo.png"
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone emby Media Server."
 
@@ -89,6 +89,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.05.21:", desc: "Structural changes upstream." }
   - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode." }
   - { date: "21.12.20:", desc: "Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." }
   - { date: "03.11.20:", desc: "Fix issue with missing samba folder." }