Vast improvement to basic theme