Prevent duplicate CSS classes in body tag (#17)
CSS class variable declaration moved ahead of if/else
Merge branch 'hotfix/2.2.2'