STY: applied new theme
MERGE: Resolved merge confilcts