          :desc "compile" "c" #'+fortran/gfortran-compile
          :desc "run"     "r" #'+fortran/gfortran-run))
 
+  (when (featurep! +intel)
+    (map! :map fortran-mode-map
+          :localleader
+          (:prefix ("i" . "ifort")
+           :desc "compile" "c" #'+fortran/ifort-compile
+           :desc "run"     "r" #'+fortran/ifort-run)))
+
   (easy-menu-define fortran-menu fortran-mode-map "Simpler menu for Fortran mode."
     '("Fortran"
-      ["Compile" +fortran/gfortran-compile :active t :help "Compile with gfortran"]
-      ["Run" +fortran/gfortran-run :active t :help "Run the Executable"])))
+      ["Compile" +fortran/build :active t :help "Compile with Project"]
+      ["Run" +fortran/run :active t :help "Run the Executable"])))

        :desc "build" "b" #'+fortran/build
        :desc "run"   "r" #'+fortran/run)

  (easy-menu-define f90-menu f90-mode-map "Simpler menu for F90 mode."
    `("F90"
      ["Compile" +fortran/build :active t :help "Compile the Project"]


  ;; --- Compilation --- ;;
  ;; Used by `compile' (SPC c c)
  (let ((cmd (cond ((featurep! +intel) "ifort ")
                   (t "gfortran -std=legacy "))))
    (setq-hook! 'fortran-mode-hook
      compile-command cmd
      compilation-buffer-name-function #'+fortran-compilation-buffer-name-fn))
  (set-popup-rule! "^\\*fortran-compilation" :side 'right :size 0.5 :quit t)

  ;; --- Keybindings --- ;;
  (map! :map fortran-mode-map
