reorganizing a little, removing pre-theme stuff