Updated with cleanup and new theme