diff --git a/files/.bashrc b/files/.bashrc
index b2c03d1..e2eae9a 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -10,7 +10,8 @@ DIR="\[\033[1;94m\]\w\[\033[m\]"
 export PS1="${HOST} ${DIR}${GIT} ${ICON} "
 
 # ============================== Aliases
-alias emacsnw="TERM=xterm-direct emacsclient -c -nw -a 'emacs -nw'"
+#alias emacsnw="TERM=xterm-direct emacsclient -c -nw -a 'emacs -nw'"
+alias emacsnw="TERM=xterm-direct emacs -nw"
 alias c='clear'
 
 alias l='ls -lh'     #size,show type,human readable
diff --git a/files/.config/i3/config b/files/.config/i3/config
index c1eb58b..e3051bb 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -14,7 +14,8 @@ workspace_layout stacking
 bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+Ctrl+Return exec --no-startup-id xterm
 bindsym $mod+d exec --no-startup-id dmenu_run
-bindsym $mod+e exec --no-startup-id "emacsclient -c"
+#bindsym $mod+e exec --no-startup-id "emacsclient -c"
+bindsym $mod+e exec --no-startup-id "emacs"
 bindsym $mod+Ctrl+e exec --no-startup-id "emacsclient --eval '(emacs-everywhere)'"
 bindsym $mod+Shift+s exec --no-startup-id "flameshot gui"
 
diff --git a/files/.zshrc b/files/.zshrc
index b7ad795..e32649a 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -44,7 +44,8 @@ export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} "
 zstyle ':vcs_info:git:*' formats '|%b '
 
 # ============================== Aliases
-alias emacsnw="TERM=alacritty-direct emacsclient -nw -a 'emacs -nw'"
+#alias emacsnw="TERM=alacritty-direct emacsclient -nw -a 'emacs -nw'"
+alias emacsnw="TERM=alacritty-direct emacs -nw"
 
 if command -v rg &> /dev/null; then
     alias grep="rg"
diff --git a/files/init.el b/files/init.el
index dd0af8d..3b68c7b 100644
--- a/files/init.el
+++ b/files/init.el
@@ -64,8 +64,10 @@
 ;; Font
 ; default font
 (set-face-attribute 'default nil :font "SFMono Nerd Font Mono" :height 110)
+(set-fontset-font t 'unicode "Source Code Pro" nil 'prepend)
+(set-fontset-font t 'unicode "Noto Color Emoji" nil 'append)
 ; fonts for daemon
-(add-to-list 'default-frame-alist '(font . "SFMono Nerd Font Mono"))
+;(add-to-list 'default-frame-alist '(font . "SFMono Nerd Font Mono"))
 
 ;; Make ESC quit prompts
 (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
@@ -149,12 +151,12 @@
   (doom-modeline-mode 1)
   (setq doom-modeline-indent-info t))
 
-; show icons in daemonized emacs
-(defun enable-doom-modeline-icons (_frame)
-  (setq doom-modeline-icon t))
-
-(add-hook 'after-make-frame-functions 
-          #'enable-doom-modeline-icons)
+;; show icons in daemonized emacs
+;;(defun enable-doom-modeline-icons (_frame)
+;;  (setq doom-modeline-icon t))
+;;
+;;(add-hook 'after-make-frame-functions 
+;;          #'enable-doom-modeline-icons)
 
 ;; show color codes
 (use-package rainbow-mode