Added full support for layers in everything currently rendered.
Forgot to add new classes.