Themes fixed. Error checking needed. Checkmark constraints needed