Added BlockSkin and BoxSkin, other fixes.