diff --git a/www.i2p2/i2p2www/pages/global/lang.html b/www.i2p2/i2p2www/pages/global/lang.html
index 4bff095fc1773ee369cfb9a0a26b4285790d1c09..f871689c74c985c6a070dc8cc97d596cee7cf9ef 100644
--- a/www.i2p2/i2p2www/pages/global/lang.html
+++ b/www.i2p2/i2p2www/pages/global/lang.html
@@ -1,13 +1,13 @@
<ul class="languages nav">
- <li><a href="?lang=en"><img src="/_static/images/us.png" alt="English" /></a></li>
- <li><a href="?lang=es"><img src="/_static/images/es.png" alt="Castellano" /></a></li>
- <li><a href="?lang=zh"><img src="/_static/images/zh.png" alt="Chinese" /></a></li>
- <li><a href="?lang=de"><img src="/_static/images/de.png" alt="Deutsch" /></a></li>
- <li><a href="?lang=fr"><img src="/_static/images/fr.png" alt="Français" /></a></li>
- <li><a href="?lang=it"><img src="/_static/images/it.png" alt="Italiano" /></a></li>
- <li><a href="?lang=nl"><img src="/_static/images/nl.png" alt="Nederlands" /></a></li>
- <li><a href="?lang=ru"><img src="/_static/images/ru.png" alt="Russian" /></a></li>
- <li><a href="?lang=sv"><img src="/_static/images/sv.png" alt="Svenska" /></a></li>
- <li><a href="?lang=cs"><img src="/_static/images/cs.png" alt="Czech" /></a></li>
- <li><a href="?lang=ar"><img src="/_static/images/ar.png" alt="Arabic" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='en') }}"><img src="{{ url_for('static', filename='images/us.png') }}" alt="English" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='es') }}"><img src="{{ url_for('static', filename='images/es.png') }}" alt="Castellano" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='zh') }}"><img src="{{ url_for('static', filename='images/zh.png') }}" alt="Chinese" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='de') }}"><img src="{{ url_for('static', filename='images/de.png') }}" alt="Deutsch" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='fr') }}"><img src="{{ url_for('static', filename='images/fr.png') }}" alt="Français" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='it') }}"><img src="{{ url_for('static', filename='images/it.png') }}" alt="Italiano" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='nl') }}"><img src="{{ url_for('static', filename='images/nl.png') }}" alt="Nederlands" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='ru') }}"><img src="{{ url_for('static', filename='images/ru.png') }}" alt="Russian" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='sv') }}"><img src="{{ url_for('static', filename='images/sv.png') }}" alt="Svenska" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='cs') }}"><img src="{{ url_for('static', filename='images/cs.png') }}" alt="Czech" /></a></li>
+ <li><a href="{{ url_for('site_show', lang='ar') }}"><img src="{{ url_for('static', filename='images/ar.png') }}" alt="Arabic" /></a></li>
</ul>
diff --git a/www.i2p2/i2p2www/pages/global/layout.html b/www.i2p2/i2p2www/pages/global/layout.html
index c5a0dc59095411cb2820d2a9f90ca5ed248dd1cb..82cd27a923a206c5884b644933967a7fc26dfdd0 100644
--- a/www.i2p2/i2p2www/pages/global/layout.html
+++ b/www.i2p2/i2p2www/pages/global/layout.html
@@ -3,14 +3,14 @@
<head>
<meta charset="UTF-8">
<title>{% block title %}{% endblock %} - I2P</title>
- <link rel="stylesheet" type="text/css" href="/_static/styles/{{ g.theme }}.css" title="{{ g.theme }}" />
- <link rel="shortcut icon" type="image/x-icon" href="/_static/favicon.ico" />
+ <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '.css') }}" title="{{ g.theme }}" />
+ <link rel="shortcut icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}" />
<meta name="robots" content="NOODP" />
</head>
<body>
<div class="hide"><a href="#content" title="Skip navigation" accesskey="2">Skip navigation</a></div>
<div id="branding">
- <h1 id="logo"><a href="/"><img src="/_static/images/logo_medium.png" alt="I2P" /></a></h1>
+ <h1 id="logo"><a href="/"><img src="{{ url_for('static', filename='images/logo_medium.png') }}" alt="I2P" /></a></h1>
<div class="title">{{ self.title() }}</div>
</div>
<div class="navigation">