a huge round of changes primarily use Glass theme