7 files changed, 22 insertions, 17 deletions
diff --git a/lib/extensions/base.py b/lib/extensions/base.py
index 91e050eb..ff587ca5 100644
--- a/lib/extensions/base.py
+++ b/lib/extensions/base.py
@@ -3,8 +3,9 @@ import re
 import json
 from copy import deepcopy
 from collections import MutableMapping
+
+from ..svg.tags import *
 from ..elements import AutoFill, Fill, Stroke, SatinColumn, Polyline, EmbroideryElement
-from .. import SVG_POLYLINE_TAG, SVG_GROUP_TAG, SVG_DEFS_TAG, INKSCAPE_GROUPMODE, EMBROIDERABLE_TAGS, PIXELS_PER_MM
 from ..utils import cache
 
 
diff --git a/lib/extensions/embroider.py b/lib/extensions/embroider.py
index 564e96ca..a213be64 100644
--- a/lib/extensions/embroider.py
+++ b/lib/extensions/embroider.py
@@ -1,12 +1,13 @@
 import sys
 import traceback
 import os
-
 import inkex
-from .. import _, PIXELS_PER_MM, write_embroidery_file
+
 from .base import InkstitchExtension
+from ..i18n import _
+from ..output import write_embroidery_file
 from ..stitch_plan import patches_to_stitch_plan
-from ..svg import render_stitch_plan
+from ..svg import render_stitch_plan, PIXELS_PER_MM
 
 
 class Embroider(InkstitchExtension):
diff --git a/lib/extensions/input.py b/lib/extensions/input.py
index bd3db0ed..f8bf5a5d 100644
--- a/lib/extensions/input.py
+++ b/lib/extensions/input.py
@@ -1,17 +1,19 @@
 import os
 from os.path import realpath, dirname, join as path_join
 import sys
+from inkex import etree
+import inkex
 
 # help python find libembroidery when running in a local repo clone
 if getattr(sys, 'frozen', None) is None:
     sys.path.append(realpath(path_join(dirname(__file__), '..', '..')))
 
 from libembroidery import *
-from inkex import etree
-import inkex
-from .. import PIXELS_PER_MM, INKSCAPE_LABEL, _
+
+from ..svg import PIXELS_PER_MM, render_stitch_plan
+from ..svg.tags import INKSCAPE_LABEL
+from ..i18n import _
 from ..stitch_plan import StitchPlan
-from ..svg import render_stitch_plan
 
 
 class Input(object):
diff --git a/lib/extensions/palettes.py b/lib/extensions/palettes.py
index 269dc6dc..f7a6c7a5 100644
--- a/lib/extensions/palettes.py
+++ b/lib/extensions/palettes.py
@@ -10,6 +10,7 @@ import time
 import logging
 import wx
 import inkex
+
 from ..utils import guess_inkscape_config_path
 
 
diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 881dab49..03a6f3cc 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -13,8 +13,8 @@ from collections import defaultdict
 from functools import partial
 from itertools import groupby
 
-from .. import _
 from .base import InkstitchExtension
+from ..i18n import _
 from ..stitch_plan import patches_to_stitch_plan
 from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn
 from ..utils import save_stderr, restore_stderr
diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py
index 5d462c0f..6450ee7c 100644
--- a/lib/extensions/print_pdf.py
+++ b/lib/extensions/print_pdf.py
@@ -10,22 +10,21 @@ from copy import deepcopy
 import wx
 import appdirs
 import json
-
 import inkex
-from .. import _, PIXELS_PER_MM, SVG_GROUP_TAG, translation as inkstitch_translation
-from .base import InkstitchExtension
-from ..stitch_plan import patches_to_stitch_plan
-from ..svg import render_stitch_plan
-from ..threads import ThreadCatalog
-
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 from datetime import date
 import base64
-
 from flask import Flask, request, Response, send_from_directory, jsonify
 import webbrowser
 import requests
 
+from .base import InkstitchExtension
+from ..i18n import _, translation as inkstitch_translation
+from ..svg import PIXELS_PER_MM, render_stitch_plan
+from ..svg.tags import SVG_GROUP_TAG
+from ..stitch_plan import patches_to_stitch_plan
+from ..threads import ThreadCatalog
+
 
 def datetimeformat(value, format='%Y/%m/%d'):
     return value.strftime(format)
diff --git a/lib/extensions/simulate.py b/lib/extensions/simulate.py
index 75bc62c7..0c372d4d 100644
--- a/lib/extensions/simulate.py
+++ b/lib/extensions/simulate.py
@@ -1,6 +1,7 @@
 import wx
 
 from .base import InkstitchExtension
+from ..i18n import _
 from ..simulator import EmbroiderySimulator
 from ..stitch_plan import patches_to_stitch_plan