UI Improvements - Default Theme - Updates #194