diff --git a/.config/sway/config b/.config/sway/config
index 6e6b86a..88271ad 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -15,7 +15,7 @@ set $menu wofi --allow-images --show=drun --prompt "Search Program"
 set $scale 1.25
 
 # Set background
-set $bg ~/.config/sway/wallpapers/blue.jpg
+set $bg ~/.config/desktop-common/wallpapers/blue.jpg
 
 # Set Efects
 set $gaps 10
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index 597b178..0a85a97 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -1,14 +1,8 @@
 ### Set borders
 gaps inner $gaps
-<<<<<<< HEAD
-for_window [class="^.*"] border pixel 2
-default_border pixel 2
-default_floating_border pixel 2
-=======
 for_window [class="^.*"] border pixel 0
 default_border pixel 0
 default_floating_border pixel 0
->>>>>>> b688e13 (shinji)
 
 ### Colors
 
diff --git a/.config/sway/logout.d/power/img/lock-hover.png b/.config/sway/logout.d/power/img/lock-hover.png
deleted file mode 100644
index 46c51b0..0000000
Binary files a/.config/sway/logout.d/power/img/lock-hover.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/lock.png b/.config/sway/logout.d/power/img/lock.png
deleted file mode 100644
index f1ec4a2..0000000
Binary files a/.config/sway/logout.d/power/img/lock.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/logout-hover.png b/.config/sway/logout.d/power/img/logout-hover.png
deleted file mode 100644
index b34a150..0000000
Binary files a/.config/sway/logout.d/power/img/logout-hover.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/logout.png b/.config/sway/logout.d/power/img/logout.png
deleted file mode 100644
index 59a5aeb..0000000
Binary files a/.config/sway/logout.d/power/img/logout.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/power-hover.png b/.config/sway/logout.d/power/img/power-hover.png
deleted file mode 100644
index a65e429..0000000
Binary files a/.config/sway/logout.d/power/img/power-hover.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/power.png b/.config/sway/logout.d/power/img/power.png
deleted file mode 100644
index 6aac455..0000000
Binary files a/.config/sway/logout.d/power/img/power.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/restart-hover.png b/.config/sway/logout.d/power/img/restart-hover.png
deleted file mode 100644
index 7921398..0000000
Binary files a/.config/sway/logout.d/power/img/restart-hover.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/restart.png b/.config/sway/logout.d/power/img/restart.png
deleted file mode 100644
index 5851243..0000000
Binary files a/.config/sway/logout.d/power/img/restart.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/sleep-hover.png b/.config/sway/logout.d/power/img/sleep-hover.png
deleted file mode 100644
index 7c9b6b3..0000000
Binary files a/.config/sway/logout.d/power/img/sleep-hover.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/img/sleep.png b/.config/sway/logout.d/power/img/sleep.png
deleted file mode 100644
index 164f5fb..0000000
Binary files a/.config/sway/logout.d/power/img/sleep.png and /dev/null differ
diff --git a/.config/sway/logout.d/power/layout b/.config/sway/logout.d/power/layout
deleted file mode 100644
index 2b53986..0000000
--- a/.config/sway/logout.d/power/layout
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "label" : "lock",
-    "action" : "swaylock -f -c 14171d",
-    "text" : "Lock",
-    "keybind" : "l"
-}
-{
-    "label" : "logout",
-    "action" : "loginctl terminate-user $USER",
-    "text" : "Logout",
-    "keybind" : "e"
-}
-{
-    "label" : "shutdown",
-    "action" : "loginctl poweroff",
-    "text" : "Shutdown",
-    "keybind" : "s"
-}
-{
-    "label" : "suspend",
-    "action" : "loginctl suspend",
-    "text" : "Suspend",
-    "keybind" : "u"
-}
-{
-    "label" : "reboot",
-    "action" : "reboot",
-    "text" : "Reboot",
-    "keybind" : "r"
-}
diff --git a/.config/sway/logout.d/power/style.css b/.config/sway/logout.d/power/style.css
deleted file mode 100644
index e80dd33..0000000
--- a/.config/sway/logout.d/power/style.css
+++ /dev/null
@@ -1,76 +0,0 @@
-nk* {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
-    font-size: 16px;
-    font-weight: bold;
-}
-
-window {
-	background-color: rgba(0, 0, 0, 0);
-}
-
-button {
-	background-color: #242434;
-    background-image: none;
-    color: #89ADF8;
-	border: 1px solid rgba(0, 0, 0, 0);
-    margin: 5px;
-	border-radius: 10px;
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: 35%;
-}
-
-button:focus, button:active {
-	background-color: #89B4FA;
-    color: #242434;
-    font-weight: 500;
-	outline-style: none;
-}
-
-#lock {
-    background-image: image(url("img/lock.png"));
-}
-
-#logout {
-    background-image: image(url("img/logout.png"));
-}
-
-#suspend {
-    background-image: image(url("img/sleep.png"));
-}
-
-#hibernate {
-    background-image: image(url("img/hibernate.png"));
-}
-
-#shutdown {
-    background-image: image(url("img/power.png"));
-}
-
-#reboot {
-    background-image: image(url("img/restart.png"));
-}
-
-#lock:focus {
-    background-image: image(url("img/lock-hover.png"));
-}
-
-#logout:focus {
-    background-image: image(url("img/logout-hover.png"));
-}
-
-#suspend:focus {
-    background-image: image(url("img/sleep-hover.png"));
-}
-
-#hibernate:focus {
-    background-image: image(url("img/hibernate-hover.png"));
-}
-
-#shutdown:focus {
-    background-image: image(url("img/power-hover.png"));
-}
-
-#reboot:focus {
-    background-image: image(url("img/restart-hover.png"));
-}
diff --git a/.config/sway/wallpapers/blue.jpg b/.config/sway/wallpapers/blue.jpg
deleted file mode 100755
index acd376b..0000000
Binary files a/.config/sway/wallpapers/blue.jpg and /dev/null differ
diff --git a/.config/sway/wallpapers/nya0.png b/.config/sway/wallpapers/nya0.png
deleted file mode 100644
index e9da5d5..0000000
Binary files a/.config/sway/wallpapers/nya0.png and /dev/null differ
diff --git a/aur b/aur
new file mode 100644
index 0000000..bcd33f5
--- /dev/null
+++ b/aur
@@ -0,0 +1,19 @@
+autotiling
+cider
+cydia-impactor
+fbterm
+i686-elf-gcc
+librewolf-bin
+lkrg-dkms
+mkinitcpio-firmware
+paru
+pesterchum-git
+pfetch-rs
+prismlauncher-qt5-bin
+swayfx
+teams
+ttf-twemoji-color
+units
+unofficial-homestuck-collection-bin
+vulkan-nouveau-git
+wlogout
diff --git a/packages b/packages
new file mode 100644
index 0000000..4510ac6
--- /dev/null
+++ b/packages
@@ -0,0 +1,189 @@
+acpi
+alacritty
+alsa-tools
+alsa-utils
+amd-ucode
+base
+base-devel
+bind
+blueberry
+bluez-utils
+brightnessctl
+btrfs-progs
+chromium
+clang
+cmake
+cups
+cups-pdf
+discord
+dmidecode
+dnsmasq
+docker
+docker-compose
+doxygen
+easyeffects
+efibootmgr
+element-desktop
+evtest
+ffmpegthumbnailer
+figlet
+firejail
+fontforge
+freealut
+fuse2
+gdb
+gimp
+git
+glfw-x11
+glm
+gnome-keyring
+gnome-themes-extra
+gnu-netcat
+gradle
+graphviz
+grim
+grub
+highlight
+htop
+hyprland
+hyprpaper
+imv
+intellij-idea-community-edition
+iwd
+jdk8-openjdk
+jq
+kitty
+krita
+less
+lib32-libva-mesa-driver
+lib32-mesa-vdpau
+lib32-vulkan-radeon
+libhandy
+libreoffice-fresh
+libva-mesa-driver
+libvirt
+linux
+linux-firmware
+linux-headers
+lutris
+lynx
+macchanger
+mako
+man-db
+man-pages
+mangohud
+maven
+mesa-vdpau
+meson
+mpv
+mtools
+nasm
+neofetch
+neovim
+network-manager-applet
+networkmanager
+networkmanager-openvpn
+nodejs
+noto-fonts-cjk
+npm
+obs-studio
+octave
+openal
+opendoas
+openldap
+p7zip
+pacman-contrib
+pandoc-cli
+pavucontrol
+paxtest
+perl-image-exiftool
+pipewire-alsa
+pipewire-pulse
+polkit-gnome
+python-pip
+python-pygments
+python-pynvim
+qbittorrent
+qemu-full
+qt5-wayland
+racket
+ranger
+ripgrep
+rlwrap
+ruby
+rustup
+sassc
+sbctl
+sbsigntools
+sl
+slurp
+sof-firmware
+starship
+stb
+steam
+strace
+swaybg
+swayidle
+swaylock
+swi-prolog
+tcpdump
+texlive-basic
+texlive-bibtexextra
+texlive-binextra
+texlive-context
+texlive-fontsextra
+texlive-fontsrecommended
+texlive-fontutils
+texlive-formatsextra
+texlive-games
+texlive-humanities
+texlive-latex
+texlive-latexextra
+texlive-latexrecommended
+texlive-luatex
+texlive-mathscience
+texlive-metapost
+texlive-music
+texlive-pictures
+texlive-plaingeneric
+texlive-pstricks
+texlive-publishers
+texlive-xetex
+thunar
+thunderbird
+tlp
+tmux
+tpm2-tools
+traceroute
+tree
+ttf-dejavu
+ttf-fira-code
+ufw
+unzip
+valgrind
+vim
+virt-manager
+virt-viewer
+vulkan-radeon
+vulkan-tools
+vulkan-validation-layers
+waybar
+waylock
+wget
+wine-staging
+winetricks
+wireguard-tools
+wl-clipboard
+wl-mirror
+wofi
+xdelta3
+xdg-desktop-portal
+xdg-desktop-portal-wlr
+xf86-video-amdgpu
+xorg-xwayland
+xwaylandvideobridge
+yt-dlp
+zathura
+zathura-pdf-mupdf
+zsh
+zsh-syntax-highlighting