diff -urN MoinMoin/config/__init__.py b/MoinMoin/config/__init__.py
--- a/MoinMoin/config/__init__.py	2008-05-19 20:50:17.000000000 +0200
+++ b/MoinMoin/config/__init__.py	2009-11-14 13:39:29.000000000 +0100
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 """
     MoinMoin - site-wide configuration defaults (NOT per single wiki!)
 
@@ -79,5 +79,7 @@
                'notes',
               ]
 
-smileys = (r"X-( :D <:( :o :( :) B) :)) ;) /!\ <!> (!) :-? :\ >:> |) " +
-           r":-( :-) B-) :-)) ;-) |-) (./) {OK} {X} {i} {1} {2} {3} {*} {o}").split()
+smileys = (ur"X-( :D <:( :o :( :) B) :)) ;) /!\ <!> (!) :-? :\ >:> |) " +
+           ur":-( :-) B-) :-)) ;-) |-) (./) {OK} {X} {i} {1} {2} {3} {*} {o} "+
+           u"{~} {8} {A} {á¹½} " +
+           u"{da} {de} {en} {es} {fi} {fr} {it} {ja} {ko} {nl} {pt} {sv} {us} {zh}").split()
diff -urN MoinMoin/theme/__init__.py b/MoinMoin/theme/__init__.py
--- a/MoinMoin/theme/__init__.py	2008-07-05 22:21:26.000000000 +0200
+++ b/MoinMoin/theme/__init__.py	2009-11-14 13:41:01.000000000 +0100
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 """
     MoinMoin - Theme Package
 
@@ -117,6 +117,29 @@
         # try {*}{*}{o}
         '{*}':        ("{*}",                    'star_on.png',     15, 15),
         '{o}':        ("{o}",                    'star_off.png',    15, 15),
+
+        ### HACK SAUVAGE 1/2
+        '{8}':        ("{8}",                    'tux16.png',       16, 16),
+        '{~}':        ("{~}",                    'win16.png',       16, 16),
+        u'{á¹½}':       (u'{á¹½}',                   'vista16.png',     16, 16),
+        '{A}':        ('{A}',                    'apple.png',       16, 16),
+
+        '{da}':       ('{da}',                   'flag-da.png',     18, 12),
+        '{de}':       ('{de}',                   'flag-de.png',     18, 12),
+        '{en}':       ('{en}',                   'flag-en.png',     18, 12),
+        '{es}':       ('{es}',                   'flag-es.png',     18, 12),
+        '{fi}':       ('{fi}',                   'flag-fi.png',     18, 12),
+        '{fr}':       ('{fr}',                   'flag-fr.png',     18, 12),
+        '{it}':       ('{it}',                   'flag-it.png',     18, 12),
+        '{ja}':       ('{ja}',                   'flag-ja.png',     18, 12),
+        '{ko}':       ('{ko}',                   'flag-ko.png',     18, 12),
+        '{nl}':       ('{nl}',                   'flag-nl.png',     18, 12),
+        '{pt}':       ('{pt}',                   'flag-pt.png',     18, 12),
+        '{sv}':       ('{sv}',                   'flag-sv.png',     18, 12),
+        '{us}':       ('{us}',                   'flag-us.png',     18, 12),
+        '{zh}':       ('{zh}',                   'flag-zh.png',     18, 12)
+        ### FIN HACK 1/2
+
     }
     del _
 
@@ -532,7 +555,9 @@
             except KeyError, err:
                 alt = 'KeyError: %s' % str(err)
         alt = self.request.getText(alt)
-        tag = self.request.formatter.image(src=img, alt=alt, width=w, height=h, **kw)
+        #### HACK SAUVAGE 2/2
+        tag = self.request.formatter.image(src=img, alt=alt, **kw)
+        #### FIN HACK 2/2
         return tag
 
     def make_iconlink(self, which, d):
@@ -1577,10 +1602,18 @@
 
         meta_keywords = request.getPragma('keywords')
         meta_desc = request.getPragma('description')
+        meta_scripts = request.getPragma('scripts')
+        meta_stylesheets = request.getPragma('stylesheets')
         if meta_keywords:
             user_head.append('<meta name="keywords" content="%s">\n' % wikiutil.escape(meta_keywords, 1))
         if meta_desc:
             user_head.append('<meta name="description" content="%s">\n' % wikiutil.escape(meta_desc, 1))
+        if meta_scripts:
+            for meta_script in meta_scripts.split():
+                user_head.append('<script type="text/javascript" src="%s"></script>\n' % wikiutil.escape(meta_script, 1))
+        if meta_stylesheets:
+            for meta_stylesheet in meta_stylesheets.split():
+                user_head.append('<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="%s">' % wikiutil.escape(meta_stylesheet, 1))
 
         # search engine precautions / optimization:
         # if it is an action or edit/search, send query headers (noindex,nofollow):