Ya, it's something like that, heh.

Organize internally? Grep? Huh? ;) What I'm doing is, I check for any 'include' lines in the theme.rc of the active theme, expand the vars, and then do a little string torture (fix ws, comments, trimming, etc) to get a list of the files to scan. So, no unnecessary files are scanned...it's nice and speedy. =)