Note GUI, custom theme
Fix for some persistence errors