diff --git a/powerline/ext/vim/segments/__init__.py b/powerline/ext/vim/segments/__init__.py
index cf7d729a..e69de29b 100644
--- a/powerline/ext/vim/segments/__init__.py
+++ b/powerline/ext/vim/segments/__init__.py
@@ -1,5 +0,0 @@
-# flake8: noqa
-
-from core import (mode, modified_indicator, paste_indicator,
-	readonly_indicator, branch, file_directory, file_name, file_format,
-	file_encoding, file_type, line_percent, line_current, col_current)
diff --git a/powerline/theme.py b/powerline/theme.py
index 8adb9b7f..2c69c6ff 100644
--- a/powerline/theme.py
+++ b/powerline/theme.py
@@ -14,10 +14,11 @@ class Theme(object):
 				contents = None
 				contents_func = None
 				segment_type = segment.get('type', 'function')
+				segment_module = segment.get('module', 'core')
 
 				if segment_type == 'function':
 					# Import segment function and assign it to the contents
-					function_module = 'powerline.ext.{0}.segments'.format(ext)
+					function_module = 'powerline.ext.{0}.segments.{1}'.format(ext, segment_module)
 					function_name = segment['name']
 					contents_func = getattr(importlib.import_module(function_module), function_name)
 				elif segment_type == 'string':