Plan class complete. Journal block theme. Some fixes.