Removing theme pieces that aren't density-specific
Updating TODO