Removed theme dependency.