Organized files, added theme setup functions