1diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim
2index d6d4b4c..9853877 100644
3--- a/autoload/health/openscad_nvim.vim
4+++ b/autoload/health/openscad_nvim.vim
5@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort
6 endfunction
7
8 function! s:check_zathura_installed() abort
9- if !executable('zathura')
10+ if !executable('@zathura@')
11 call v:lua.vim.health.error('has(zathura)','install zathura')
12 else
13 call v:lua.vim.health.ok("zathura is installed")
14@@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort
15 endfunction
16
17 function! s:check_htop_installed() abort
18- if !executable('htop')
19+ if !executable('@htop@')
20 call v:lua.vim.health.error('has(htop)','install htop')
21 else
22 call v:lua.vim.health.ok("htop is installed")
23diff --git a/lua/openscad.lua b/lua/openscad.lua
24index 0a26d08..1264989 100644
25--- a/lua/openscad.lua
26+++ b/lua/openscad.lua
27@@ -101,7 +101,7 @@ end
28
29 function M.manual()
30 local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf"
31- api.nvim_command('silent !zathura --fork ' .. path)
32+ api.nvim_command('silent !@zathura@ --fork ' .. path)
33 end
34
35 function M.help()
36@@ -126,7 +126,7 @@ function M.exec_openscad()
37 jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename
38 else
39 -- TODO: What about Windows?
40- jobCommand = 'openscad ' .. filename
41+ jobCommand = '@openscad@ ' .. filename
42 end
43
44 vim.fn.jobstart(jobCommand)