Updated themes and modules to latest develop branches