diff --git a/MANIFEST.in b/MANIFEST.in
index fc46d905..a092ecd0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE
-global-include *.bat
diff --git a/docs/conf.py b/docs/conf.py
index 6c4e1ce5..ac2d67ee 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -3,6 +3,8 @@ import sys, os
 
 sys.path.append(os.path.abspath('..'))
 
+from pelican import __version__, __major__
+
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
@@ -11,8 +13,8 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = "2"
-release = version
+version = __version__
+release = __major__
 
 # -- Options for HTML output ---------------------------------------------------
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5ffcc3b5..780938a7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,7 +11,9 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "3.0"
+__major__ = 3
+__minor__ = 0
+__version__ = "{0}.{1}".format(__major__, __minor__)
 
 
 class Pelican(object):
diff --git a/pelican/log.py b/pelican/log.py
index 027743d0..8811b372 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
+from logging import CRITICAL, ERROR, WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
@@ -8,31 +8,25 @@ from logging import Formatter, getLogger, StreamHandler
 RESET_TERM = u'\033[0;m'
 
 
-def term_color(code):
-    return lambda text: code + unicode(text) + RESET_TERM
+def start_color(index):
+    return u'\033[1;{0}m'.format(index)
+
+
+def term_color(color):
+    code = COLOR_CODES[color]
+    return lambda text: start_color(code) + unicode(text) + RESET_TERM
 
 
 COLOR_CODES = {
-    'gray': u'\033[1;30m',
-    'red': u'\033[1;31m',
-    'green': u'\033[1;32m',
-    'yellow': u'\033[1;33m',
-    'blue': u'\033[1;34m',
-    'magenta': u'\033[1;35m',
-    'cyan': u'\033[1;36m',
-    'white': u'\033[1;37m',
-    'bgred': u'\033[1;41m',
-    'bggreen': u'\033[1;42m',
-    'bgbrown': u'\033[1;43m',
-    'bgblue': u'\033[1;44m',
-    'bgmagenta': u'\033[1;45m',
-    'bgcyan': u'\033[1;46m',
-    'bggray': u'\033[1;47m',
-    'bgyellow': u'\033[1;43m',
-    'bggrey': u'\033[1;100m',
+    'red': 31,
+    'yellow': 33,
+    'cyan': 36,
+    'white': 37,
+    'bgred': 41,
+    'bggrey': 100,
 }
 
-ANSI = dict((col, term_color(code)) for col, code in COLOR_CODES.items())
+ANSI = dict((col, term_color(col)) for col in COLOR_CODES)
 
 
 class ANSIFormatter(Formatter):
@@ -80,7 +74,7 @@ class DummyFormatter(object):
            and not sys.platform.startswith('win'):
             return ANSIFormatter(*args, **kwargs)
         else:
-            return TextFormatter( *args, **kwargs)
+            return TextFormatter(*args, **kwargs)
 
 
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
diff --git a/tools/__init__.py b/pelican/tools/__init__.py
similarity index 100%
rename from tools/__init__.py
rename to pelican/tools/__init__.py
diff --git a/tools/pelican_import.py b/pelican/tools/pelican_import.py
similarity index 100%
rename from tools/pelican_import.py
rename to pelican/tools/pelican_import.py
diff --git a/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
similarity index 100%
rename from tools/pelican_quickstart.py
rename to pelican/tools/pelican_quickstart.py
diff --git a/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
similarity index 100%
rename from tools/pelican_themes.py
rename to pelican/tools/pelican_themes.py
diff --git a/setup.py b/setup.py
index 910499de..1f75131b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-VERSION = "3.0" # find a better way to do so.
+from pelican import __version__
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 
@@ -13,21 +13,21 @@ except ImportError:
 entry_points = {
     'console_scripts': [
         'pelican = pelican:main',
-        'pelican-import = tools.pelican_import:main',
-        'pelican-quickstart = tools.pelican_quickstart:main',
-        'pelican-themes = tools.pelican_themes:main'
+        'pelican-import = pelican.tools.pelican_import:main',
+        'pelican-quickstart = pelican.tools.pelican_quickstart:main',
+        'pelican-themes = pelican.tools.pelican_themes:main'
    ]     
 }
 
 setup(
     name = "pelican",
-    version = VERSION,
+    version = __version__,
     url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog from reStructuredText or Markdown input files.",
     long_description=open('README.rst').read(),
-    packages = ['pelican'],
+    packages = ['pelican', 'pelican.tools'],
     include_package_data = True,
     install_requires = requires,
     entry_points = entry_points,