Updated the Addon mess

That uses way to many block IDs and will cause problems in the future.