Fixed bugs
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed bug theme export
Merge remote-tracking branch 'BolognaEAT/master' into BolognaEAT
requires commit, but without changes for some reason