diff --git a/configurations/profile/home/editor/emacs/default.nix b/configurations/profile/home/editor/emacs/default.nix
index 06333db..e392238 100644
--- a/configurations/profile/home/editor/emacs/default.nix
+++ b/configurations/profile/home/editor/emacs/default.nix
@@ -13,7 +13,7 @@ in
   config = lib.mkIf cfg.enable {
     programs.emacs = {
       enable = true;
-      package = with pkgs; lib.mkDefault (if pkgs ? emacs-pgtk then emacs-pgtk else emacs-gtk);
+      package = with pkgs; lib.mkDefault (if pkgs ? emacs-pgtk then emacs-pgtk else emacs29-gtk);
       extraPackages = epkgs: with epkgs; [
         evil
         evil-numbers
@@ -45,8 +45,7 @@ in
         markdown-mode
         json-mode
 
-        vscode-dark-plus-theme
-        kaolin-themes
+        moe-theme
       ];
       extraConfig = ''
         ;;;; Set emacs PATH
diff --git a/extraFiles/config/emacs/config.el b/extraFiles/config/emacs/config.el
index 75f9814..f93db5b 100644
--- a/extraFiles/config/emacs/config.el
+++ b/extraFiles/config/emacs/config.el
@@ -1,8 +1,17 @@
 ;Graphical
-(when (display-graphic-p)
-    (setq-default cursor-type '(bar . 1))
-    (set-frame-font "FiraCode Nerd Font" nil t)
-)
+;(when (display-graphic-p)
+;    
+;)
+(tool-bar-mode -1)
+(load-theme 'moe-dark)
+
+
+(setq-default cursor-type '(bar . 1))
+(set-frame-font "FiraCode Nerd Font" nil t)
+(pixel-scroll-precision-mode 1)
+(setq pixel-scroll-precision-large-scroll-height 10.0)
+(setq mouse-wheel-follow-mouse 't) 
+
 
 ;Hide startup screen if started with file
 (defun startup-screen-advice (orig-fun &rest args)
@@ -10,12 +19,19 @@
     (apply orig-fun args)))
 (advice-add 'display-startup-screen :around #'startup-screen-advice)
 
+
+
+
+
 ;Enable dashboard
 (dashboard-setup-startup-hook)
 (when (daemonp)
     (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon
 )
 
+
+
+
 :CUA
 (cua-mode 1)
 (global-set-key (kbd "C-y") 'undo-redo)