Modern

Merged modern style