diff --git a/Makefile b/Makefile
index 71988269..f2a4199b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,13 +36,16 @@ runDemo: .venv
 
 build: .venv
 	. .venv/bin/activate ; \
-	rm -rf dist ; \
 	tools/prepareBuild.sh release ; \
-	python3 -m build
+	cd tmp ; \
+	python3 -m build \
+
+deploy: .venv
+	. .venv/bin/activate ; \
+	python3 -m twine upload tmp/dist/*
 
 buildTest: .venv
 	. .venv/bin/activate ; \
-	rm -rf dist ; \
 	tools/prepareBuild.sh test ; \
 	python3 -m build ; \
 
@@ -57,11 +60,7 @@ deployDoc:
 
 deployTest: .venv
 	. .venv/bin/activate ; \
-	python3 -m twine upload --repository testpypi dist/* --verbose
-
-deploy: .venv
-	. .venv/bin/activate ; \
-	python3 -m twine upload dist/*
+	python3 -m twine upload --repository testpypi tmp/dist/* --verbose
 
 test: .venv
 	. .venv/bin/activate ; \
diff --git a/TermTk/TTkTheme/theme.py b/TermTk/TTkTheme/theme.py
index 413cdfdf..82b0b6af 100644
--- a/TermTk/TTkTheme/theme.py
+++ b/TermTk/TTkTheme/theme.py
@@ -24,7 +24,7 @@
 
 from TermTk.TTkCore.color import TTkColor
 from TermTk.TTkCore.helper import TTkHelper
-from TermTk.TTkCore.string import TTkString
+# from TermTk.TTkCore.string import TTkString
 import TermTk.TTkTheme.fileicon_nerd  as fi_nerd
 import TermTk.TTkTheme.fileicon_utf8  as fi_utf8
 import TermTk.TTkTheme.fileicon_ascii as fi_ascii
diff --git a/setup.py b/setup.py
index dd2e5298..e52269aa 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 import setuptools, os
-from tmp.TermTk.TTkCore.cfg import TTkCfg
+from TermTk.TTkCore.cfg import TTkCfg
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
@@ -31,7 +31,7 @@ setuptools.setup(
         "Topic :: Terminals",
         "Topic :: Software Development :: User Interfaces"],
     # packages=setuptools.find_packages(),
-    packages = setuptools.find_packages(where="tmp"),
-    package_dir = {"":"tmp"},
+    packages = setuptools.find_packages(where="."),
+    package_dir = {"":"."},
     python_requires=">=3.8",
-)
\ No newline at end of file
+)
diff --git a/tools/prepareBuild.sh b/tools/prepareBuild.sh
index 140eda11..b31b29fb 100755
--- a/tools/prepareBuild.sh
+++ b/tools/prepareBuild.sh
@@ -70,6 +70,8 @@ echo Name: ${_NAME}
 mkdir -p ${_TMP_PATH}
 rm -rf ${_TMP_PATH}/*
 
+cp setup.py README.md LICENSE ${_TMP_PATH}
+
 cp -a ${_BASE_PATH}/TermTk ${_TMP_PATH}
 sed "s,__VERSION__,${_VERSION}," -i ${_TMP_PATH}/TermTk/TTkCore/cfg.py
 sed "s,__NAME__,${_NAME}," -i ${_TMP_PATH}/TermTk/TTkCore/cfg.py