Modifed Strategy pattern theme and stuff