Merged with vanila theme for further works