diff --git a/.open_add b/.open_add
index d9cfb62..445e501 100644
--- a/.open_add
+++ b/.open_add
@@ -1,2 +1 @@
 Finder
-System Settings
diff --git a/.open_ignore b/.open_ignore
index cc246ea..f67ccb9 100644
--- a/.open_ignore
+++ b/.open_ignore
@@ -1,18 +1 @@
-grep
 Uninstall
-Applications
-Library
-System
-Users
-Volumes
-bin
-cores
-dev
-etc
-home
-opt
-private
-sbin
-tmp
-usr
-var
diff --git a/Makefile b/Makefile
index 2871ac3..04a0f69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,22 @@
 DESTDIR = /usr/local/bin
 INSTALL_PATH = $(DESTDIR)/clauncher
-HELPER_PATH = $(DESTDIR)/capture.zsh
 
 all: install
 
-install: $(INSTALL_PATH) $(HELPER_PATH)
+install: $(INSTALL_PATH)
 
 $(INSTALL_PATH): clauncher
 	@echo "Installing clauncher to $(DESTDIR)"
 	@install -m 755 $< $(DESTDIR)
 
-$(HELPER_PATH): capture.zsh
-	@echo "Installing capture.zsh to $(DESTDIR)"
-	@install -m 755 $< $(DESTDIR)
-
 uninstall:
 	@echo "Removing clauncher from $(DESTDIR)"
 	@rm -f $(INSTALL_PATH)
-	@echo "Removing capture.zsh from $(DESTDIR)"
-	@rm -f $(HELPER_PATH)
 
 help:
 	@echo "Available targets:"
-	@echo "  make install   - Install clauncher and capture.zsh to $(DESTDIR)"
-	@echo "  make uninstall - Remove clauncher and capture.zsh from $(DESTDIR)"
+	@echo "  make install   - Install clauncher to $(DESTDIR)"
+	@echo "  make uninstall - Remove clauncher from $(DESTDIR)"
 	@echo "  make help      - Show this help message"
 
 .PHONY: all install uninstall help
diff --git a/capture.zsh b/capture.zsh
deleted file mode 100755
index d1c7dcf..0000000
--- a/capture.zsh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/zsh
-#https://github.com/Valodim/zsh-capture-completion
-zmodload zsh/zpty || { echo 'error: missing module zsh/zpty' >&2; exit 1 }
-
-# spawn shell
-zpty z zsh -f -i
-
-# line buffer for pty output
-local line
-
-setopt rcquotes
-() {
-    zpty -w z source $1
-    repeat 4; do
-        zpty -r z line
-        [[ $line == ok* ]] && return
-    done
-    echo 'error initializing.' >&2
-    exit 2
-} =( <<< '
-# no prompt!
-PROMPT=
-
-# load completion system
-autoload compinit
-compinit -d ~/.cache/zsh/.zcompdump_capture
-
-# never run a command
-bindkey ''^M'' undefined
-bindkey ''^J'' undefined
-bindkey ''^I'' complete-word
-
-# send a line with null-byte at the end before and after completions are output
-null-line () {
-    echo -E - $''\0''
-}
-compprefuncs=( null-line )
-comppostfuncs=( null-line exit )
-
-# never group stuff!
-zstyle '':completion:*'' list-grouped false
-# don''t insert tab when attempting completion on empty line
-zstyle '':completion:*'' insert-tab false
-# no list separator, this saves some stripping later on
-zstyle '':completion:*'' list-separator ''''
-
-# we use zparseopts
-zmodload zsh/zutil
-
-# override compadd (this our hook)
-compadd () {
-
-    # check if any of -O, -A or -D are given
-    if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
-        # if that is the case, just delegate and leave
-        builtin compadd "$@"
-        return $?
-    fi
-
-    # ok, this concerns us!
-    # echo -E - got this: "$@"
-
-    # be careful with namespacing here, we don''t want to mess with stuff that
-    # should be passed to compadd!
-    typeset -a __hits __dscr __tmp
-
-    # do we have a description parameter?
-    # note we don''t use zparseopts here because of combined option parameters
-    # with arguments like -default- confuse it.
-    if (( $@[(I)-d] )); then # kind of a hack, $+@[(r)-d] doesn''t work because of line noise overload
-        # next param after -d
-        __tmp=${@[$[${@[(i)-d]}+1]]}
-        # description can be given as an array parameter name, or inline () array
-        if [[ $__tmp == \(* ]]; then
-            eval "__dscr=$__tmp"
-        else
-            __dscr=( "${(@P)__tmp}" )
-        fi
-    fi
-
-    # capture completions by injecting -A parameter into the compadd call.
-    # this takes care of matching for us.
-    builtin compadd -A __hits -D __dscr "$@"
-
-    # JESUS CHRIST IT TOOK ME FOREVER TO FIGURE OUT THIS OPTION WAS SET AND WAS MESSING WITH MY SHIT HERE
-    setopt localoptions norcexpandparam extendedglob
-
-    # extract prefixes and suffixes from compadd call. we can''t do zsh''s cool
-    # -r remove-func magic, but it''s better than nothing.
-    typeset -A apre hpre hsuf asuf
-    zparseopts -E P:=apre p:=hpre S:=asuf s:=hsuf
-
-    # append / to directories? we are only emulating -f in a half-assed way
-    # here, but it''s better than nothing.
-    integer dirsuf=0
-    # don''t be fooled by -default- >.>
-    if [[ -z $hsuf && "${${@//-default-/}% -# *}" == *-[[:alnum:]]#f* ]]; then
-        dirsuf=1
-    fi
-
-    # just drop
-    [[ -n $__hits ]] || return
-
-    # this is the point where we have all matches in $__hits and all
-    # descriptions in $__dscr!
-
-    # display all matches
-    local dsuf dscr
-    for i in {1..$#__hits}; do
-
-        # add a dir suffix?
-        (( dirsuf )) && [[ -d $__hits[$i] ]] && dsuf=/ || dsuf=
-        # description to be displayed afterwards
-        (( $#__dscr >= $i )) && dscr=" -- ${${__dscr[$i]}##$__hits[$i] #}" || dscr=
-
-        echo -E - $IPREFIX$apre$hpre$__hits[$i]$dsuf$hsuf$asuf$dscr
-
-    done
-
-}
-
-# signal success!
-echo ok')
-
-zpty -w z "$*"$'\t'
-
-integer tog=0
-# read from the pty, and parse linewise
-while zpty -r z; do :; done | while IFS= read -r line; do
-    if [[ $line == *$'\0\r' ]]; then
-        (( tog++ )) && return 0 || continue
-    fi
-    # display between toggles
-    (( tog )) && echo -E - $line
-done
-
-return 2
diff --git a/clauncher b/clauncher
index 728d293..2c9a8a3 100755
--- a/clauncher
+++ b/clauncher
@@ -7,10 +7,21 @@ historyFile="$cacheDir/launcher_opts_history"
 
 update_cache() {
     if ! [[ -f "$cacheFile" ]] || [[ "$1" == "force" ]]; then
-	[[ -f "$configDir/.open_ignore" ]] && ignore_option=('-v' '-f' "$configDir/.open_ignore")
-	[[ -f "$configDir/.open_add" ]] && add_option="$(cat "$configDir/.open_add")"
 
-	capture.zsh 'open -a' | sed -e 's/.*-a//' -e "s/\\\//g" -e "s/\r//g" | grep "${ignore_option[@]:-}" | (echo -n "${add_option:-}"; cat -) | sort -u > "$cacheFile"
+	if [ -f "$customLocationsFile" ]; then
+            while IFS= read -r location; do
+                locations+=("$location")
+            done < "$customLocationsFile"
+	else
+	    locations=(
+	      "$HOME/Applications"
+	      "/System/Applications"
+	      "/Applications"
+	    )
+        fi
+
+	#find . "${locations[@]}" -maxdepth 2 -name "*.app" -type d | gxargs -d '\n' basename | sed 's/\.app$//' | ( [ -f "$configDir/.open_ignore" ] && grep -v -f "$configDir/.open_ignore" || cat -) | ([ -f "$configDir/.open_add" ] && cat "$configDir/.open_add"; cat -) | sort -u > "$cacheFile"
+	find . "${locations[@]}" -maxdepth 2 -name "*.app" -type d | gxargs -d '\n' basename | sed 's/\.app$//' | ({ [ -f "$configDir/.open_ignore" ] && grep -v -f "$configDir/.open_ignore"; } || cat -) | ([ -f "$configDir/.open_add" ] && cat "$configDir/.open_add"; cat -) | sort -u > "$cacheFile"
     fi
 }