25538 Moved layouts to theme