Added main theme and modules