Apply same changes from alpha theme added to master into Dev