Updating themes
pfff
Fixing conflicts