Porting changes from working dir to theme