-<img style="float: right" src="http://codewiz.org/wiki/BernieAvatar128x128.png" />
-<h1 class="fn">Bernie Innocenti</h1>\\
-<a class="url org" href="http://sugarlabs.org/">Sugar Labs Foundation</a>\\
-<a class="email" href="mailto:bernie@codewiz.org">bernie@codewiz.org</a>\\
-
-Jabber ID: <a class="url" href="xmpp:bernie@codewiz.org">bernie@codwiz.org</a>\\
-IRC Nick: <span class="irc">_bernie</span>\\
-
-<div class="tags">
-Tags:
-<a href="http://kitchen.technorati.com/contacts/tag/haxx0r">haxx0r</a>
-<a href="http://kitchen.technorati.com/contacts/tag/freeasinfreedom">freeasinfreedom</a>
-<a href="http://kitchen.technorati.com/contacts/tag/!microsoft">!microsoft</a>
-</div>
+<div style="float: left">{{ pictures/bernie/at-work/bernie-desk-paraguay.jpg | maxwidth=320 }}</div>
+
+**<span class="fn">Bernie Innocenti</span>** <<a class="email" href="mailto:bernie+wiki@codewiz.org">bernie****@****codewiz.org</a>> \\
+Linux Systems Engineer \\
+
+Software Engineer, <a class="url org" href="http://www.google.com/">Google</a> \\
+Infrastructure Team Coordinator, <a class="url org" href="http://sugarlabs.org/">Sugar Labs Foundation</a> \\
+
+Public SSH keys: [[https://codewiz.org/pub/authorized_keys]] \\
+Public GPG key: [[https://codewiz.org/pub/bernie_pgp_pubkey.asc | 71FF4BAC]] \\
+