diff --git a/install.sh b/install.sh
index dd8ae9d..ee1eace 100755
--- a/install.sh
+++ b/install.sh
@@ -213,6 +213,7 @@ UBUNTU_MODES_FOLDER="/usr/share/gnome-shell/modes"
 
 install_gdm() {
   local GDM_THEME_DIR="${1}/${2}${3}"
+  local YARU_GDM_THEME_DIR="$SHELL_THEME_FOLDER/Yaru/${2}${3}"
 
   echo
   prompt -i "Installing ${2}${3} gdm theme..."
@@ -252,10 +253,32 @@ install_gdm() {
   if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then
     prompt -i "Installing Ubuntu GDM theme..."
     cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak"
-    cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE"
-    [[ -d "$UBUNTU_MODES_FOLDER" ]] && cp -an "$UBUNTU_MODES_FOLDER" "$UBUNTU_MODES_FOLDER"-bak
-    [[ -f "$UBUNTU_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$UBUNTU_JSON_FILE"
-    [[ -f "$YURA_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$YURA_JSON_FILE"
+    rm -rf "$UBUNTU_YARU_THEME_FILE"
+
+    mkdir -p                                                                              ${YARU_GDM_THEME_DIR}/gnome-shell
+    mkdir -p                                                                              ${YARU_GDM_THEME_DIR}/gnome-shell/Yaru
+    cp -r ${SRC_DIR}/assets/gnome-shell/icons                                             ${YARU_GDM_THEME_DIR}/gnome-shell
+    cp -r ${SRC_DIR}/main/gnome-shell/pad-osd.css                                         ${YARU_GDM_THEME_DIR}/gnome-shell
+    cp -r ${SRC_DIR}/main/gnome-shell/gdm3${color}.css                                    ${YARU_GDM_THEME_DIR}/gnome-shell/gdm3.css
+    cp -r ${SRC_DIR}/main/gnome-shell/gnome-shell${color}.css                             ${YARU_GDM_THEME_DIR}/gnome-shell/Yaru/gnome-shell.css
+    cp -r ${SRC_DIR}/assets/gnome-shell/common-assets                                     ${YARU_GDM_THEME_DIR}/gnome-shell/assets
+    cp -r ${SRC_DIR}/assets/gnome-shell/assets${color}/*.svg                              ${YARU_GDM_THEME_DIR}/gnome-shell/assets
+    cp -r ${SRC_DIR}/assets/gnome-shell/activities/activities.svg                         ${YARU_GDM_THEME_DIR}/gnome-shell/assets
+
+    cd "${YARU_GDM_THEME_DIR}/gnome-shell"
+    mv -f assets/no-events.svg no-events.svg
+    mv -f assets/process-working.svg process-working.svg
+    mv -f assets/no-notifications.svg no-notifications.svg
+
+    glib-compile-resources \
+      --sourcedir="$YARU_GDM_THEME_DIR/gnome-shell" \
+      --target="$UBUNTU_YARU_THEME_FILE" \
+      "${SRC_DIR}/main/gnome-shell/gnome-shell-yaru-theme.gresource.xml"
+
+    rm -rf ${YARU_GDM_THEME_DIR}
+    # [[ -d "$UBUNTU_MODES_FOLDER" ]] && cp -an "$UBUNTU_MODES_FOLDER" "$UBUNTU_MODES_FOLDER"-bak
+    # [[ -f "$UBUNTU_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$UBUNTU_JSON_FILE"
+    # [[ -f "$YURA_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$YURA_JSON_FILE"
   fi
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-yaru-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-yaru-theme.gresource.xml
new file mode 100644
index 0000000..511f0a4
--- /dev/null
+++ b/src/main/gnome-shell/gnome-shell-yaru-theme.gresource.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell/theme">
+    <file>assets/calendar-arrow-left.svg</file>
+    <file>assets/calendar-arrow-right.svg</file>
+    <file>assets/calendar-today.svg</file>
+    <file>assets/checkbox.svg</file>
+    <file>assets/checkbox-off.svg</file>
+    <file>assets/dash-placeholder.svg</file>
+    <file>assets/more-results.svg</file>
+    <file>assets/noise-texture.svg</file>
+    <file>assets/toggle-off.svg</file>
+    <file>assets/toggle-on.svg</file>
+    <file>assets/window-close.svg</file>
+    <file>assets/window-close-hover.svg</file>
+    <file>assets/window-close-active.svg</file>
+    <file>assets/activities.svg</file>
+    <file>assets/view-app-grid.svg</file>
+    <file>assets/background.jpg</file>
+    <file>icons/scalable/actions/color-pick.svg</file>
+    <file>icons/scalable/status/eye-not-looking-symbolic.svg</file>
+    <file>icons/scalable/status/eye-open-negative-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-enter-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-hide-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-layout-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-shift-filled-symbolic.svg</file>
+    <file>icons/scalable/status/message-indicator-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-double-click-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-drag-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-primary-click-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-secondary-click-symbolic.svg</file>
+    <file>Yaru/gnome-shell.css</file>
+    <file>gdm3.css</file>
+    <file>pad-osd.css</file>
+    <file>no-events.svg</file>
+    <file>no-notifications.svg</file>
+    <file>process-working.svg</file>
+  </gresource>
+</gresources>