refactore modules/themes into extensions (suite)
refactore modules/themes into extensions (suite)