#190 All layouts now use dynamic classes