Added new rake conditions and new layout for themes only.