September overhaul

Change bug / Persistent tema