reorganizing theme file structure + custom font added