diff --git a/anmol-test-theme.el b/emacs/anmol-test-theme.el
similarity index 100%
rename from anmol-test-theme.el
rename to emacs/anmol-test-theme.el
diff --git a/init.el b/emacs/init.el
similarity index 95%
rename from init.el
rename to emacs/init.el
index b16b46d..146e7b3 100644
--- a/init.el
+++ b/emacs/init.el
@@ -35,10 +35,6 @@
  kept-old-versions 2
  version-control t)       ; use versioned backups
 
-;; Simple splash screen
-(setq fancy-startup-text nil)
-(setq fancy-splash-image (expand-file-name "logo-svg/blackhole-lines.svg" user-emacs-directory))
-
 ;; Fold long lines
 (global-visual-line-mode)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Package Management  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -73,6 +69,7 @@
 (ivy-mode)
 (setq ivy-use-virtual-buffers t)
 (setq enable-recursive-minibuffers t)
+(setq ivy-use-selectable-prompt t)
 (global-set-key "\C-s" 'swiper)
 (global-set-key (kbd "C-c C-r") 'ivy-resume)
 (global-set-key (kbd "<f6>") 'ivy-resume)
@@ -105,11 +102,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Rice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Setting font
-(set-face-attribute 'default nil
-		    :family "VictorMono Nerd Font"
-		    :height 150
-		    :weight 'normal
-		    :width 'normal)
+(set-face-attribute 'default nil :font "VictorMono Nerd Font-18")
+(set-frame-font "VictorMono Nerd Font-18" nil t)
+
+
+;; Simple splash screen
+(setq fancy-startup-text nil)
+(setq fancy-splash-image (expand-file-name (concat user-emacs-directory "logo-svg/emacs-e.svg") user-emacs-directory))
+
 (load-theme 'anmol-test 't)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Resize Windows ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/logo-svg/blackhole-lines.svg b/emacs/logo-svg/blackhole-lines.svg
similarity index 100%
rename from logo-svg/blackhole-lines.svg
rename to emacs/logo-svg/blackhole-lines.svg
diff --git a/logo-svg/emacs-e.svg b/emacs/logo-svg/emacs-e.svg
similarity index 100%
rename from logo-svg/emacs-e.svg
rename to emacs/logo-svg/emacs-e.svg
diff --git a/logo-svg/gnu_black.svg b/emacs/logo-svg/gnu_black.svg
similarity index 100%
rename from logo-svg/gnu_black.svg
rename to emacs/logo-svg/gnu_black.svg
diff --git a/logo-svg/gnu_color.svg b/emacs/logo-svg/gnu_color.svg
similarity index 100%
rename from logo-svg/gnu_color.svg
rename to emacs/logo-svg/gnu_color.svg
diff --git a/logo-svg/org-mode.svg b/emacs/logo-svg/org-mode.svg
similarity index 100%
rename from logo-svg/org-mode.svg
rename to emacs/logo-svg/org-mode.svg
diff --git a/logo-svg/xemacs_black.svg b/emacs/logo-svg/xemacs_black.svg
similarity index 100%
rename from logo-svg/xemacs_black.svg
rename to emacs/logo-svg/xemacs_black.svg
diff --git a/logo-svg/xemacs_color.svg b/emacs/logo-svg/xemacs_color.svg
similarity index 100%
rename from logo-svg/xemacs_color.svg
rename to emacs/logo-svg/xemacs_color.svg
diff --git a/sway/config b/sway/config
new file mode 100644
index 0000000..0ac1c57
--- /dev/null
+++ b/sway/config
@@ -0,0 +1,237 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term alacritty
+# Your preferred application launcher
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+set $menu wofi --show run
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
+output * bg /home/anmol/Pictures/evening_rain_train.png fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+Shift+q kill
+
+    # Start your launcher
+    bindsym $mod+p exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+c reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+# Bind the media keys volume up, volume down and mute
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
+
+# Default Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+    position top
+
+    # When the status_command prints a new line to stdout, swaybar updates.
+    # The default just shows the current date and time.
+    status_command while echo "🔋 $(cat /sys/class/power_supply/BAT*/capacity)% ╠╣ 🔊 $(awk -F'[][]' '/Left:/ { print $2 }' <(amixer sget Master)) ╠╣ 📶 $(ip r | awk 'NR==1 {print $3 $5}') ╠╣ 🕑 $(date +'%Y-%m-%d %I:%M:%S %p')" ; do sleep 1; done
+
+    colors {
+        statusline #ffffff
+        background #323232
+	focused_workspace #ffffff00 #9f1209 #ffffff
+        inactive_workspace #32323200 #32323200 #5c5c5c
+    }
+}
+
+# Customize border
+set $border_color "#9f1209"
+
+default_border pixel 2
+client.focused $border_color $border_color "#ffffff" $border_color
+
+# Hide cursor when using keyboard
+seat * hide_cursor when-typing enable
+
+# Waybar
+#exec waybar
+# gaps
+gaps inner 10
+smart_gaps off
+
+include @sysconfdir@/sway/config.d/*
\ No newline at end of file