Fixed and cleaned up image regexes