Patching environment loading
Making theme smarter, part 001