Rename theme hooks to match method names
Pass theme id instead of theme object to theme hooks