Use theme in layout include, add macro for private property, remove warning in TinyJs.