updated layout themes to match more