Re-Druplifiy, add some tweaks.