diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3b6a57c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,45 @@
+
+.PHONY: help
+help:
+	@cat README.md
+
+.PHONY: keyrings
+keyrings: \
+	desktop/etc/apt/keyrings/google-archive-keyring.gpg \
+	desktop/etc/apt/keyrings/microsoft-archive-keyring.gpg \
+	desktop/etc/apt/keyrings/slack-archive-keyring.gpg \
+	desktop/etc/apt/keyrings/syncthing-archive-keyring.gpg \
+	etc/apt/keyrings/cloudflare-archive-keyring.gpg \
+	etc/apt/keyrings/docker-archive-keyring.gpg \
+	etc/apt/keyrings/nodesource-archive-keyring.gpg \
+	etc/apt/keyrings/tailscale-archive-keyring.gpg \
+
+desktop/etc/apt/keyrings/google-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 https://dl.google.com/linux/linux_signing_key.pub \
+		| gpg --dearmor >$@
+
+desktop/etc/apt/keyrings/microsoft-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 https://packages.microsoft.com/keys/microsoft.asc \
+		| gpg --dearmor >$@
+
+desktop/etc/apt/keyrings/slack-archive-keyring.gpg:
+	curl -sSfL --tlsv1.2 https://packagecloud.io/slacktechnologies/slack/gpgkey \
+		| gpg --dearmor >$@
+
+desktop/etc/apt/keyrings/syncthing-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 -o $@ https://syncthing.net/release-key.gpg
+
+etc/apt/keyrings/cloudflare-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 https://pkg.cloudflare.com/cloudflare-main.gpg \
+		| gpg --dearmor >$@
+
+etc/apt/keyrings/docker-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 https://download.docker.com/linux/ubuntu/gpg \
+		| gpg --dearmor >$@
+
+etc/apt/keyrings/nodesource-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
+		| gpg --dearmor >$@
+
+etc/apt/keyrings/tailscale-archive-keyring.gpg:
+	curl -sSf --tlsv1.3 -o $@ https://pkgs.tailscale.com/stable/ubuntu/noble.noarmor.gpg
diff --git a/desktop/etc/apt/sources.list.d/google-chrome.list b/desktop/etc/apt/sources.list.d/google-chrome.list
deleted file mode 100644
index 4218d19..0000000
--- a/desktop/etc/apt/sources.list.d/google-chrome.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/google-archive-keyring.gpg] https://dl.google.com/linux/chrome/deb/ stable main
diff --git a/desktop/etc/apt/sources.list.d/google-chrome.sources b/desktop/etc/apt/sources.list.d/google-chrome.sources
new file mode 100644
index 0000000..a3aae97
--- /dev/null
+++ b/desktop/etc/apt/sources.list.d/google-chrome.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://dl.google.com/linux/chrome/deb/
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/google-archive-keyring.gpg
+Architectures: amd64
diff --git a/desktop/etc/apt/sources.list.d/microsoft-edge.list b/desktop/etc/apt/sources.list.d/microsoft-edge.list
deleted file mode 100644
index 166c2bb..0000000
--- a/desktop/etc/apt/sources.list.d/microsoft-edge.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/edge stable main
diff --git a/desktop/etc/apt/sources.list.d/microsoft-edge.sources b/desktop/etc/apt/sources.list.d/microsoft-edge.sources
new file mode 100644
index 0000000..b91384f
--- /dev/null
+++ b/desktop/etc/apt/sources.list.d/microsoft-edge.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://packages.microsoft.com/repos/edge
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/microsoft-archive-keyring.gpg
+Architectures: amd64
diff --git a/desktop/etc/apt/sources.list.d/slack-archive.list b/desktop/etc/apt/sources.list.d/slack-archive.list
deleted file mode 100644
index 8563798..0000000
--- a/desktop/etc/apt/sources.list.d/slack-archive.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/slack-archive-keyring.gpg] https://packagecloud.io/slacktechnologies/slack/debian/ jessie main
diff --git a/desktop/etc/apt/sources.list.d/slack-archive.sources b/desktop/etc/apt/sources.list.d/slack-archive.sources
new file mode 100644
index 0000000..bf65129
--- /dev/null
+++ b/desktop/etc/apt/sources.list.d/slack-archive.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://packagecloud.io/slacktechnologies/slack/debian/
+Suites: jessie
+Components: main
+Signed-By: /usr/share/keyrings/slack-archive-keyring.gpg
+Architectures: amd64
diff --git a/desktop/etc/apt/sources.list.d/syncthing.list b/desktop/etc/apt/sources.list.d/syncthing.list
deleted file mode 100644
index 50f8619..0000000
--- a/desktop/etc/apt/sources.list.d/syncthing.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/syncthing-archive-keyring.gpg] https://apt.syncthing.net/ syncthing stable
diff --git a/desktop/etc/apt/sources.list.d/syncthing.sources b/desktop/etc/apt/sources.list.d/syncthing.sources
new file mode 100644
index 0000000..a5a4b54
--- /dev/null
+++ b/desktop/etc/apt/sources.list.d/syncthing.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://apt.syncthing.net/
+Suites: syncthing
+Components: stable
+Signed-By: /usr/share/keyrings/syncthing-archive-keyring.gpg
+Architectures: amd64
diff --git a/desktop/etc/apt/sources.list.d/vscode.list b/desktop/etc/apt/sources.list.d/vscode.list
deleted file mode 100644
index 7ecf339..0000000
--- a/desktop/etc/apt/sources.list.d/vscode.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/code stable main
diff --git a/desktop/etc/apt/sources.list.d/vscode.sources b/desktop/etc/apt/sources.list.d/vscode.sources
new file mode 100644
index 0000000..5f8f8b8
--- /dev/null
+++ b/desktop/etc/apt/sources.list.d/vscode.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://packages.microsoft.com/repos/code
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/microsoft-archive-keyring.gpg
+Architectures: amd64
diff --git a/desktop/settings.ini b/desktop/settings.ini
index b5408db..d6b374c 100644
--- a/desktop/settings.ini
+++ b/desktop/settings.ini
@@ -42,7 +42,7 @@ remove-old-trash-files=true
 xkb-options=['ctrl:nocaps']
 
 # IBusの設定 絵文字の無効化
-[org/freedesktop/ibus/panel/emoji]
+[desktop/ibus/panel/emoji]
 hotkey=@as []
 
 # [マウスとタッチパッド] > [マウス]
@@ -62,4 +62,4 @@ show-banners=false
 
 # Dockのお気に入りの設定
 [org/gnome/shell]
-favorite-apps=['firefox_firefox.desktop', 'thunderbird.desktop','slack.desktop', 'code.desktop', 'org.gnome.Nautilus.desktop']
+favorite-apps=['firefox_firefox.desktop', 'slack.desktop', 'thunderbird_thunderbird.desktop', 'code.desktop', 'org.gnome.Nautilus.desktop']
diff --git a/etc/apt/sources.list.d/cloudflare.list b/etc/apt/sources.list.d/cloudflare.list
deleted file mode 100644
index 644183c..0000000
--- a/etc/apt/sources.list.d/cloudflare.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/cloudflare-archive-keyring.gpg] https://pkg.cloudflare.com/cloudflared jammy main
diff --git a/etc/apt/sources.list.d/cloudflare.sources b/etc/apt/sources.list.d/cloudflare.sources
new file mode 100644
index 0000000..59f2455
--- /dev/null
+++ b/etc/apt/sources.list.d/cloudflare.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://pkg.cloudflare.com/cloudflared
+Suites: jammy
+Components: main
+Signed-By: /usr/share/keyrings/cloudflare-archive-keyring.gpg
+Architectures: amd64
diff --git a/etc/apt/sources.list.d/docker.list b/etc/apt/sources.list.d/docker.list
deleted file mode 100644
index 2d056e4..0000000
--- a/etc/apt/sources.list.d/docker.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable
diff --git a/etc/apt/sources.list.d/docker.sources b/etc/apt/sources.list.d/docker.sources
new file mode 100644
index 0000000..e029c39
--- /dev/null
+++ b/etc/apt/sources.list.d/docker.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://download.docker.com/linux/ubuntu
+Suites: noble
+Components: stable
+Signed-By: /usr/share/keyrings/docker-archive-keyring.gpg
+Architectures: amd64
diff --git a/etc/apt/sources.list.d/nodesource.list b/etc/apt/sources.list.d/nodesource.list
deleted file mode 100644
index fc90b76..0000000
--- a/etc/apt/sources.list.d/nodesource.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_22.x nodistro main
diff --git a/etc/apt/sources.list.d/nodesource.sources b/etc/apt/sources.list.d/nodesource.sources
new file mode 100644
index 0000000..4301db0
--- /dev/null
+++ b/etc/apt/sources.list.d/nodesource.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://deb.nodesource.com/node_22.x
+Suites: nodistro
+Components: main
+Signed-By: /usr/share/keyrings/nodesource-archive-keyring.gpg
+Architectures: amd64
diff --git a/etc/apt/sources.list.d/tailscale.list b/etc/apt/sources.list.d/tailscale.list
deleted file mode 100644
index 95dcf82..0000000
--- a/etc/apt/sources.list.d/tailscale.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/ubuntu jammy main
diff --git a/etc/apt/sources.list.d/tailscale.sources b/etc/apt/sources.list.d/tailscale.sources
new file mode 100644
index 0000000..e189572
--- /dev/null
+++ b/etc/apt/sources.list.d/tailscale.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://pkgs.tailscale.com/stable/ubuntu
+Suites: noble
+Components: main
+Signed-By: /usr/share/keyrings/tailscale-archive-keyring.gpg
+Architectures: amd64
diff --git a/mod.bash b/mod.bash
index 6cb3e21..25a0abf 100644
--- a/mod.bash
+++ b/mod.bash
@@ -18,6 +18,8 @@ function install_apt_packages() {
   local apt_sources_dir
   . packages.bash
   eval "$(apt-config shell apt_sources_dir 'Dir::Etc::sourceparts/d')"
+  apt update
+  apt install -y rsync
   rsync -rv etc/apt/keyrings/ /usr/share/keyrings/
   rsync -rv etc/apt/sources.list.d/ "$apt_sources_dir"
   [[ -d etc/default ]] &&
diff --git a/packages.bash b/packages.bash
index 9915981..de3d8d6 100644
--- a/packages.bash
+++ b/packages.bash
@@ -1,4 +1,5 @@
 packages=(
+bash-completion
 build-essential
 cloudflared
 curl
@@ -10,6 +11,7 @@ git-crypt
 imagemagick
 jq
 knot-dnsutils
+nano
 nodejs
 qemu-user-static
 screen