8 files changed, 59 insertions, 47 deletions
diff --git a/_includes/header.html b/_includes/header.html
index 68c6e25..e826db4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,14 +7,14 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{{ site.baseurl }}/">
+            <a class="{% if page.url == "/index.html" or page.url == "/" %}active {% endif %} navbar-brand" href="{{ site.baseurl }}/">
                 <img alt="Irssi Logo" class="navbar-irssi-logo" src="{{ site.baseurl }}/assets/logo.png">
                 {% comment %}{{ site.title }}{% endcomment %}
             </a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li{% if page.url == "/news/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}/news">News</a></li>{%
+                <li{% if page.url == "/news/index.html" or page.url == "/news/" %} class="active"{% endif %}><a href="{{ site.baseurl }}/news">News</a></li>{%
                   comment %}
                     Exclude the news feed and the paginated news pages.
                 {% endcomment %}{% capture pageidx %}{% include weighted_sorted_pages.html %}{% endcapture %}{% assign pageidx = pageidx | strip_newlines | split:',' %}{% comment %}
diff --git a/about/index.html b/about/index.html
new file mode 100644
index 0000000..b0a5d99
--- /dev/null
+++ b/about/index.html
@@ -0,0 +1,3 @@
+---
+redirect_to: /
+---
diff --git a/assets/css/style.css b/assets/css/style.css
index cf2d501..869353a 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -85,6 +85,23 @@ h3 a {
     color: #333;
 }
 
+.navbar-inverse .navbar-header > a.navbar-brand {
+    opacity: 0.62;
+}
+
+.navbar-inverse .navbar-header > a.navbar-brand:hover,
+.navbar-inverse .navbar-header > a.navbar-brand:focus {
+    opacity: 1;
+}
+
+.navbar-inverse .navbar-header > a.navbar-brand.active,
+.navbar-inverse .navbar-header > a.navbar-brand.active:hover,
+.navbar-inverse .navbar-header > a.navbar-brand.active:focus {
+    opacity: 1;
+    color: #fff;
+    background-color: #080808;
+}
+
 /* Position the irssi logo */
 .navbar-brand img {
     margin-top: -14px;
diff --git a/development/index.markdown b/development/index.markdown
index 9d964d1..1353660 100644
--- a/development/index.markdown
+++ b/development/index.markdown
@@ -4,8 +4,6 @@ title: Contributing
 permalink: /development/
 ---
 
-# Irssi - Contributing
-
 ### Development sources
 
 To get started with Irssi development, first check out the git repository:
diff --git a/about/index.markdown b/documentation/about/index.markdown
index d323a50..9c60ce7 100644
--- a/about/index.markdown
+++ b/documentation/about/index.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: About Irssi
 permalink: /about/
-categories: [ _nav, _1 ]
+categories: [ _1 ]
 twocolumn: true
 ---
 
diff --git a/documentation/index.markdown b/documentation/index.markdown
index 1f5feab..34cb822 100644
--- a/documentation/index.markdown
+++ b/documentation/index.markdown
@@ -1,23 +1,30 @@
 ---
 layout: page
-title: Documentation
+title: Help
 permalink: documentation/
 categories: [ _nav ]
 ---
 
-## Irssi documentation and tutorials:
-
 ### Documentation
 
-- Check the built-in `/HELP`, it has all the details on command syntax
+- [Frequently Asked Questions](faq)
 - [Startup How-To](startup)
+- Check the built-in `/HELP`, it has all the details on command syntax
 - [Settings](settings)
-- [Frequently Asked Questions](faq)
-- [Writing good bug reports](//github.com/irssi/irssi/blob/master/docs/crash.txt){:rel='external'}
 - [Design](//github.com/irssi/irssi/blob/master/docs/design.txt){:rel='external'}
 - [Manual](//github.com/irssi/irssi/blob/master/docs/manual.txt){:rel='external'}, a bit dated and unfinished
 - [Contributing](/development)
 
+### Support
+
+- [`#irssi` IRC](/support/irc)
+
+> If your irssi crashes, it's always a bug. Please read [bugreporting howto](/documentation/crash)
+and send one. For other type of bugs, it would still be nice to hear of them,
+but chances are that it's already known. Send all bugreports to irssi's [bug
+reporting system](//github.com/irssi/irssi/issues), but check if it has already
+been reported first.
+
 ### Miscellaneous
 
 - [Tips & Tricks](tips)
@@ -25,6 +32,7 @@ categories: [ _nav ]
 - [Colour Formats](//github.com/irssi/irssi/blob/master/docs/formats.txt){:rel='external'}
 - [Special Variables](//github.com/irssi/irssi/blob/master/docs/special_vars.txt){:rel='external'}
 - [Irssi 0.8.17 Tips](//github.com/shabble/irssi-docs/wiki/Irssi-0.8.17){:rel='external'}
+- [About Irssi](about) (historical)
 
 ### Tutorials
 
@@ -41,3 +49,20 @@ categories: [ _nav ]
 - [Signals](//github.com/irssi/irssi/blob/master/docs/signals.txt){:rel='external'}
 - (Unofficial) [Irssi Scripting and Documentation Wiki](//github.com/shabble/irssi-docs/wiki){:rel='external'}
 
+### Compiling problems
+
+Read the [INSTALL](//github.com/irssi/irssi/blob/master/INSTALL){:rel='external'} file that comes with irssi, it explains the most common
+problems.
+
+### Still problems?
+
+Read the [FAQ](/documentation/faq)
+before asking anything.
+The [Startup How-To](/documentation/startup) is quite useful as well.
+And if you just want to know about some setting, you could very well guess
+it yourself too, like if you want to change something related to windows,
+try `/SET window`.
+
+If you still haven't found what you're looking for, and googling didn't help either,
+try asking on IRC in `#irssi`.
+
diff --git a/support/index.markdown b/support/index.markdown
index 8b4d9a5..feeb465 100644
--- a/support/index.markdown
+++ b/support/index.markdown
@@ -1,34 +1,3 @@
 ---
-layout: page
-title: Support
-permalink: support/
-categories: [ _nav ]
+redirect_to: /documentation/
 ---
-- [FAQ](/documentation/faq)
-- [Startup How-To](/documentation/startup)
-- [`#irssi` IRC](irc)
-
-If your irssi crashes, it's always a bug. Please read [bugreporting howto](/documentation/crash)
-and send one. For other type of bugs, it would still be nice to hear of them,
-but chances are that it's already known. Send all bugreports to irssi's [bug
-reporting system](//github.com/irssi/irssi/issues), but check if it has already
-been reported first.
-
-Compiling problems
-------------------
-
-Read the INSTALL file that comes with irssi, it explains the most common
-problems.
-
-Still problems?
----------------
-
-Read the [FAQ](/documentation/faq)
-before asking anything.
-The [Startup How-To](/documentation/startup) is quite useful as well.
-And if you just want to know about some setting, you could very well guess
-it yourself too, like if you want to change something related to windows,
-try `/SET window`.
-
-If you still haven't found what you're looking for, and googling didn't help either,
-try asking on IRC in `#irssi`.
diff --git a/support/irc/index.markdown b/support/irc/index.markdown
index 924781d..a3a05d1 100644
--- a/support/irc/index.markdown
+++ b/support/irc/index.markdown
@@ -7,7 +7,7 @@ permalink: support/irc/
 Official international channel
 -------------------------------
 
-- \#irssi at [Freenode](http://freenode.net/)- English only
+- \#irssi at [Freenode](http://freenode.net/) -- English only
 
 Other channels
 --------------
@@ -16,9 +16,9 @@ Many other networks like IRCnet, EFNet or QuakeNet also have `#irssi` channels.
 
 There may be some international channels on IRCnet, like
 
-- \#irssi.fi - Finnish
-- \#irssi.de - German
-- \#irssi.pl - Polish
+- \#irssi.fi -- Finnish
+- \#irssi.de -- German
+- \#irssi.pl -- Polish
 
 If you have something to ask, **please JUST ASK instead of asking if you
 can ask or if someone can help or if anyone is there**.