Theme support added, worked on default theme and presentation styles