Fixed theme-functions to call correct files