diff --git a/archiso/airootfs/etc/hostname b/archiso/airootfs/etc/hostname
index 9cfbd72..262d086 100644
--- a/archiso/airootfs/etc/hostname
+++ b/archiso/airootfs/etc/hostname
@@ -1 +1 @@
-SnigdhaOS
+SNIGDHAOS
diff --git a/archiso/airootfs/etc/pacman.conf b/archiso/airootfs/etc/pacman.conf
index 43cc27c..f88220d 100644
--- a/archiso/airootfs/etc/pacman.conf
+++ b/archiso/airootfs/etc/pacman.conf
@@ -15,7 +15,7 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
-HoldPkg      = pacman glibc
+HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
@@ -30,17 +30,15 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-Color
+#Color
 #NoProgressBar
 CheckSpace
-VerbosePkgLists
-ParallelDownloads = 8
-ILoveCandy
-DisableDownloadTimeout
+#VerbosePkgLists
+ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel = Required DatabaseOptional
+SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
@@ -71,22 +69,26 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[snigdhaos-core]
-SigLevel = Never
-Server = https://snigdha-os.github.io/$repo/$arch
-
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
+[snigdhaos-core]
+SigLevel = Never
+Include = /etc/pacman.d/snigdhaos-mirrorlist
+
 #[extra-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[snigdhaos-extra]
+SigLevel = Never
+Include = /etc/pacman.d/snigdhaos-mirrorlist
+
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 
@@ -101,3 +103,6 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+[chaotic-aur]
+Include = /etc/pacman.d/chaotic-mirrorlist
diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index 7caa48a..cf119e8 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -54,7 +54,7 @@ xorg-server
 xorg-xinit
 #################### SNIGDHA OS BASE ####################
 
-#################### SNIGHA OS NVIDIA ####################
+#################### SNIGHA OS NVIDIA ###################
 nvidia-dkms
 nvidia-utils
 nvidia-settings
@@ -64,3 +64,14 @@ egl-wayland
 #################### SNIGDHA OS EXTRA ###################
 file-roller
 laptop-detect
+#################### SNIGDHA OS EXTRA ###################
+
+################### SNIGHA OS CHAOTIC ###################
+chaotic-keyring
+chaotic-mirrorlist
+################### SNIGHA OS CHAOTIC ###################
+
+################### SNIGHA OS SELF ######################
+rate-mirrors
+snigdhaos-gnome-ui
+