ARQUIDEAS-985 # Changes for theme in mark-up