diff --git a/crates/aiken/src/cmd/completion/completion.rs b/crates/aiken/src/cmd/completion/completion.rs
index 63efc74a..39af1f53 100644
--- a/crates/aiken/src/cmd/completion/completion.rs
+++ b/crates/aiken/src/cmd/completion/completion.rs
@@ -1,9 +1,8 @@
+use std::{fs::File, io::Write, path::Path};
 
-use std::{fs::File, io::Write};
-
+use crate::cmd::Cmd as MainCmd;
 use clap::{Command, Subcommand};
 use clap_complete::{generate, Shell};
-use crate::cmd::Cmd as MainCmd;
 use std::fs::OpenOptions;
 
 /// Generates shell completion scripts
@@ -15,78 +14,86 @@ pub struct Args {
 }
 
 fn generate_wrapper(shell: Shell, buf: &mut dyn Write) {
-        let cli = Command::new("aiken").disable_version_flag(true);
-        let mut main = MainCmd::augment_subcommands(cli);
-        generate(
-            shell,
-            &mut main,
-            "aiken".to_string(),
-            buf,
-        );
+    let cli = Command::new("aiken").disable_version_flag(true);
+    let mut main = MainCmd::augment_subcommands(cli);
+    generate(shell, &mut main, "aiken".to_string(), buf);
 }
 
 fn zsh() -> miette::Result<()> {
-
-
     //if oh-my-zsh
-    //if zsh-completions in data_dir
-
-    let xdg_dirs = xdg::BaseDirectories::with_prefix("zsh-completions").unwrap();
-    let data_home = xdg_dirs.get_data_home();
     let home = std::env::var("HOME").expect("Cannot find your home directory");
-    let mut completion_file : File;
+    let xdg_dirs = xdg::BaseDirectories::with_prefix("zsh-completions/site-functions").unwrap();
+    let data_home = xdg_dirs.get_data_home();
+    let mut completion_file: File;
+
+    let oh_my_zsh_path = Path::new(&home).join(".oh-my-zsh");
+
+    if oh_my_zsh_path.exists() {
+        let completions_path = oh_my_zsh_path.join("completions");
+        let aiken_completion_path = completions_path.join("_aiken");
+        if !completions_path.exists() {
+            std::fs::create_dir(completions_path.as_path()).expect("cannot create directory");
+        }
+        completion_file = File::create(aiken_completion_path).expect("cannot open file");
+
+        generate_wrapper(Shell::Zsh, &mut completion_file);
+        return Ok(());
+    } 
+
 
     if data_home.exists() {
-        let completion_path = xdg_dirs.place_data_file("_aiken").expect("cannot create directory");
+        let completion_path = xdg_dirs
+            .place_data_file("_aiken")
+            .expect("cannot create directory");
         completion_file = File::create(completion_path).expect("cannot open file");
+        generate_wrapper(Shell::Zsh, &mut completion_file);
+        return Ok(());
+    } 
 
-    } else {
+    let completion_path = xdg_dirs
+        .place_data_file("_aiken")
+        .expect("cannot create directory");
+    completion_file = File::create(completion_path).expect("cannot open file");
 
-        let completion_path = xdg_dirs.place_data_file("_aiken").expect("cannot create directory");
-        completion_file = File::create(completion_path).expect("cannot open file");
-
-        let mut zshrc = OpenOptions::new().write(true).append(true).open(format!("{}/.zshrc",home)).expect(".zshrc file not found");
-        if let Some(home) = data_home.to_str() {
-            let fpath: String = format!(r#"fpath=($fpath "{}")"#, home);
-            if let Err(e) = writeln!(zshrc,"{}", fpath ) {
-                    eprintln!("Couldn't write to file: {}", e);
-            }
-            
+    let mut zshrc = OpenOptions::new()
+        .write(true)
+        .append(true)
+        .open(format!("{}/.zshrc", home))
+        .expect(".zshrc file not found");
+    if let Some(home) = data_home.to_str() {
+        let fpath: String = format!(r#"fpath=($fpath "{}")"#, home);
+        if let Err(e) = writeln!(zshrc, "{}", fpath) {
+            eprintln!("Couldn't write to file: {}", e);
         }
     }
 
     generate_wrapper(Shell::Zsh, &mut completion_file);
-
     Ok(())
+
 }
 
 fn completions_to_file(shell: Shell) -> miette::Result<()> {
-
     match shell {
         Shell::Bash => {
             todo!()
-        },
+        }
         Shell::Fish => {
             todo!()
-        },
+        }
         Shell::Zsh => {
             zsh()?;
-        },
+        }
         _ => eprintln!("Shell not supported"),
     }
 
     Ok(())
 }
 
-pub fn exec(cmd_args: Args, shell: Shell) -> miette::Result<()>{
+pub fn exec(cmd_args: Args, shell: Shell) -> miette::Result<()> {
     if cmd_args.install {
         completions_to_file(shell)?;
-    }else {
-        generate_wrapper(
-            shell,
-            &mut std::io::stdout(),
-        );
+    } else {
+        generate_wrapper(shell, &mut std::io::stdout());
     }
     Ok(())
 }
-