Added theme file support