diff --git a/.config/oh-my-posh/zen.toml b/.config/oh-my-posh/zen.toml
new file mode 100644
index 00000000..6e094f2a
--- /dev/null
+++ b/.config/oh-my-posh/zen.toml
@@ -0,0 +1,72 @@
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+version = 3
+final_space = true
+
+[secondary_prompt]
+  template = '❯❯ '
+  foreground = 'magenta'
+  background = 'transparent'
+
+[transient_prompt]
+  template = '❯ '
+  background = 'transparent'
+  foreground_templates = ['{{if gt .Code 0}}red{{end}}', '{{if eq .Code 0}}magenta{{end}}']
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    template = '{{ .Path }}'
+    foreground = 'blue'
+    background = 'transparent'
+    type = 'path'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      style = 'full'
+
+  [[blocks.segments]]
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+    foreground = 'p:grey'
+    background = 'transparent'
+    type = 'git'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      branch_icon = ''
+      cache_duration = 'none'
+      commit_icon = '@'
+      fetch_status = true
+
+[[blocks]]
+  type = 'rprompt'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    template = '{{ .FormattedMs }}'
+    foreground = 'yellow'
+    background = 'transparent'
+    type = 'executiontime'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      threshold = 5000
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    template = '❯'
+    background = 'transparent'
+    type = 'text'
+    style = 'plain'
+    foreground_templates = ['{{if gt .Code 0}}red{{end}}', '{{if eq .Code 0}}magenta{{end}}']
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
diff --git a/.config/oh-my-posh/zen.toml.bak b/.config/oh-my-posh/zen.toml.bak
new file mode 100644
index 00000000..7edb6f05
--- /dev/null
+++ b/.config/oh-my-posh/zen.toml.bak
@@ -0,0 +1,74 @@
+#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+
+version = 2
+final_space = true
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'path'
+    style = 'plain'
+    background = 'transparent'
+    foreground = 'blue'
+    template = '{{ .Path }}'
+
+    [blocks.segments.properties]
+      style = 'full'
+
+  [[blocks.segments]]
+    type = 'git'
+    style = 'plain'
+    foreground = 'p:grey'
+    background = 'transparent'
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+
+    [blocks.segments.properties]
+      branch_icon = ''
+      commit_icon = '@'
+      fetch_status = true
+
+[[blocks]]
+  type = 'rprompt'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    type = 'executiontime'
+    style = 'plain'
+    foreground = 'yellow'
+    background = 'transparent'
+    template = '{{ .FormattedMs }}'
+
+    [blocks.segments.properties]
+      threshold = 5000
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    type = 'text'
+    style = 'plain'
+    foreground_templates = [
+      "{{if gt .Code 0}}red{{end}}",
+      "{{if eq .Code 0}}magenta{{end}}",
+    ]
+    background = 'transparent'
+    template = '❯'
+
+[transient_prompt]
+  foreground_templates = [
+    "{{if gt .Code 0}}red{{end}}",
+    "{{if eq .Code 0}}magenta{{end}}",
+  ]
+  background = 'transparent'
+  template = '❯ '
+
+[secondary_prompt]
+  foreground = 'magenta'
+  background = 'transparent'
+  template = '❯❯ '
diff --git a/.config/waybar/config b/.config/waybar/config
index c7e77413..216f0715 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -3,7 +3,7 @@
   "modules-left": ["custom/logo", "hyprland/workspaces" ],
   "height": 24,
   "modules-center": [  "hyprland/window"],
-  "modules-right": ["pulseaudio", "network", "cpu", "memory", "disk", "clock"],
+  "modules-right": ["pulseaudio", "network", "cpu", "memory", "disk", "battery", "clock"],
   "reload_style_on_change":true,
 
   "custom/logo": {
@@ -89,8 +89,8 @@
             "warning": 30,
             "critical": 20
         },
-        "format": "{capacity}%  {icon} ",
-        "format-charging": "{capacity}% 󰂄 ",
+        "format": " {icon} {capacity}%",
+        "format-charging": "󰂄 {capacity}%",
         "format-plugged": "{capacity}% 󰂄 ",
         "format-alt": "{time} {icon}",
             "format-icons": [
@@ -163,7 +163,7 @@
 
 "pulseaudio": {
   "format": "{volume}% ",
-  "format-bluetooth":"󰂰",
+  "format-bluetooth":"󰂰 ",
   "format-muted": "<span font='12'></span>",
   "format-icons": {
     "headphones": "",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 4a1e81b0..81d6af49 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -37,7 +37,9 @@ window#waybar {
   background: #000000;
 }
 
-#battery,
+#battery {
+    color: #94e2d5;
+}
 #custom-clipboard,
 #custom-colorpicker,
 #custom-powerDraw,
@@ -100,8 +102,13 @@ window#waybar {
 }
 
 #battery.charging {
-    color: #ffffff;
-    background-color: #26A65B;
+    color: #313244;
+    background-color: #74c7ec;
+    margin-left: 5px;
+    margin-right: 5px;
+    padding-left: 5px;
+    padding-right: 5px;
+    border-radius: 5px;
 }
 
 #battery.warning:not(.charging) {
diff --git a/.zshrc b/.zshrc
index 0bcbabaf..b48b5cf8 100755
--- a/.zshrc
+++ b/.zshrc
@@ -1,144 +1,141 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-
-# Path to your Oh My Zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time Oh My Zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="powerlevel10k/powerlevel10k"
-
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in $ZSH/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
-
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment one of the following lines to change the auto-update behavior
-# zstyle ':omz:update' mode disabled  # disable automatic updates
-# zstyle ':omz:update' mode auto      # update automatically without asking
-# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
-
-# Uncomment the following line to change how often to auto-update (in days).
-# zstyle ':omz:update' frequency 13
-
-# Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS="true"
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(
-  git
-  sudo
-  colored-man-pages
-  colorize
-  docker
-  docker-compose
-  zsh-autosuggestions
-  zsh-syntax-highlighting
-  copyfile
-)
-
-bindkey '^H' backward-kill-word
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
+# # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# # Initialization code that may require console input (password prompts, [y/n]
+# # confirmations, etc.) must go above this block; everything else may go below.
+# if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+#   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 # fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch $(uname -m)"
-
-# Set personal aliases, overriding those provided by Oh My Zsh libs,
-# plugins, and themes. Aliases can be placed here, though Oh My Zsh
-# users are encouraged to define aliases within a top-level file in
-# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
-# - $ZSH_CUSTOM/aliases.zsh
-# - $ZSH_CUSTOM/macos.zsh
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# ~/.zshrc
+# 
+# # If you come from bash you might have to change your $PATH.
+# # export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+# 
+# # Path to your Oh My Zsh installation.
+# export ZSH="$HOME/.oh-my-zsh"
+# 
+# # Set name of the theme to load --- if set to "random", it will
+# # load a random theme each time Oh My Zsh is loaded, in which case,
+# # to know which specific one was loaded, run: echo $RANDOM_THEME
+# # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+# ZSH_THEME="powerlevel10k/powerlevel10k"
+# 
+# # Set list of themes to pick from when loading at random
+# # Setting this variable when ZSH_THEME=random will cause zsh to load
+# # a theme from this variable instead of looking in $ZSH/themes/
+# # If set to an empty array, this variable will have no effect.
+# # ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+# 
+# # Uncomment the following line to use case-sensitive completion.
+# # CASE_SENSITIVE="true"
+# 
+# # Uncomment the following line to use hyphen-insensitive completion.
+# # Case-sensitive completion must be off. _ and - will be interchangeable.
+# # HYPHEN_INSENSITIVE="true"
+# 
+# # Uncomment one of the following lines to change the auto-update behavior
+# # zstyle ':omz:update' mode disabled  # disable automatic updates
+# # zstyle ':omz:update' mode auto      # update automatically without asking
+# # zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+# 
+# # Uncomment the following line to change how often to auto-update (in days).
+# # zstyle ':omz:update' frequency 13
+# 
+# # Uncomment the following line if pasting URLs and other text is messed up.
+# # DISABLE_MAGIC_FUNCTIONS="true"
+# 
+# # Uncomment the following line to disable colors in ls.
+# # DISABLE_LS_COLORS="true"
+# 
+# # Uncomment the following line to disable auto-setting terminal title.
+# # DISABLE_AUTO_TITLE="true"
+# 
+# # Uncomment the following line to enable command auto-correction.
+# # ENABLE_CORRECTION="true"
+# 
+# # Uncomment the following line to display red dots whilst waiting for completion.
+# # You can also set it to another string to have that shown instead of the default red dots.
+# # e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# # Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# # COMPLETION_WAITING_DOTS="true"
+# 
+# # Uncomment the following line if you want to disable marking untracked files
+# # under VCS as dirty. This makes repository status check for large repositories
+# # much, much faster.
+# # DISABLE_UNTRACKED_FILES_DIRTY="true"
+# 
+# # Uncomment the following line if you want to change the command execution time
+# # stamp shown in the history command output.
+# # You can set one of the optional three formats:
+# # "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# # or set a custom format using the strftime function format specifications,
+# # see 'man strftime' for details.
+# # HIST_STAMPS="mm/dd/yyyy"
+# 
+# # Would you like to use another custom folder than $ZSH/custom?
+# # ZSH_CUSTOM=/path/to/new-custom-folder
+# 
+# # Which plugins would you like to load?
+# # Standard plugins can be found in $ZSH/plugins/
+# # Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# # Example format: plugins=(rails git textmate ruby lighthouse)
+# # Add wisely, as too many plugins slow down shell startup.
+# plugins=(
+#   git
+#   sudo
+#   colored-man-pages
+#   colorize
+#   docker
+#   docker-compose
+#   zsh-autosuggestions
+#   zsh-syntax-highlighting
+#   copyfile
+# )
+# 
+# bindkey '^H' backward-kill-word
+# 
+# source $ZSH/oh-my-zsh.sh
+# 
+# # User configuration
+# 
+# # export MANPATH="/usr/local/man:$MANPATH"
+# 
+# # You may need to manually set your language environment
+# # export LANG=en_US.UTF-8
+# 
+# # Preferred editor for local and remote sessions
+# # if [[ -n $SSH_CONNECTION ]]; then
+# #   export EDITOR='vim'
+# # else
+# #   export EDITOR='mvim'
+# # fi
+# 
+# # Compilation flags
+# # export ARCHFLAGS="-arch $(uname -m)"
+# 
+# # Set personal aliases, overriding those provided by Oh My Zsh libs,
+# # plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# # users are encouraged to define aliases within a top-level file in
+# # the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# # - $ZSH_CUSTOM/aliases.zsh
+# # - $ZSH_CUSTOM/macos.zsh
+# # For a full list of active aliases, run `alias`
+# #
+# # Example aliases
+# # alias zshconfig="mate ~/.zshrc"
+# # alias ohmyzsh="mate ~/.oh-my-zsh"
+# 
+# # ~/.zshrc
 export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
 zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
 source <(carapace _carapace)
+# 
+# # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+# [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+# 
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"
 
-
-BLK="D4" CHR="DE" DIR="B7" EXE="78" REG="E7" HARDLINK="9F" SYMLINK="9F" MISSING="67" ORPHAN="D2" FIFO="E5" SOCK="E5" OTHER="D2"
-export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$OTHER"
-alias cp="/usr/local/bin/cpg -g"
-alias mv="/usr/local/bin/mvg -g"
+# alias cp="/usr/local/bin/cpg -g"
+# alias mv="/usr/local/bin/mvg -g"
 alias ls="lsd -l"
 alias pa="sudo pacman"
 alias nano="nvim"
-source ~/powerlevel10k/powerlevel10k.zsh-theme
-source ~/powerlevel10k/powerlevel10k.zsh-theme
-typeset -g POWERLEVEL9K_INSTANT_PROMPT=off
 clear