Default Theme - Improvements