Reverted moonstone, fixed headers