diff --git a/README.md b/README.md
index b6e472a..7129057 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,13 @@
-# fishline
-
-[![Join the chat at https://gitter.im/0rax/fishline](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/0rax/fishline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-**A powerline prompt framework for the fish-shell built in fish-shell.**
+<p align="center">
+    <a href="README.md"><img src="https://raw.githubusercontent.com/0rax/fishline/screenshots/logo.png" width=512 style="margin-bottom:0px"></img></a>
+</p>
+<h4 align="center">A powerline prompt framework for the fish-shell built in fish-shell</h4>
+<p align="center">
+    <a href="https://github.com/0rax/fishline/releases/latest"><img src="https://img.shields.io/github/release/0rax/fishline.svg" alt="Latest release"></a>
+    <a href="https://gitter.im/0rax/fishline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img src="https://badges.gitter.im/Join%20Chat.svg" alt="Join the chat at https://gitter.im/0rax/fishline"></a>
+</p>
+
+## Preview
 
 ![fishline_preview](https://raw.githubusercontent.com/0rax/fishline/screenshots/prompt.png "Fishline Preview")
 
diff --git a/segments/__flseg_user.fish b/segments/__flseg_user.fish
new file mode 100644
index 0000000..b6aeabf
--- /dev/null
+++ b/segments/__flseg_user.fish
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+# -*-  mode:fish; tab-width:4  -*-
+
+function __flseg_user
+
+    __fishline_segment $FLCLR_USER_BG $FLCLR_USER_FG
+    printf $USER
+
+end
diff --git a/tests/fltest_user.fish b/tests/fltest_user.fish
new file mode 100644
index 0000000..93e0e23
--- /dev/null
+++ b/tests/fltest_user.fish
@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+# -*-  mode:fish; tab-width:4  -*-
+
+function fltest_user
+
+    __fishline_test USER
+
+end
diff --git a/themes/default_256_colors.fish b/themes/default_256_colors.fish
index 6acfdb4..89e8a88 100644
--- a/themes/default_256_colors.fish
+++ b/themes/default_256_colors.fish
@@ -56,7 +56,9 @@ set FLCLR_GIT_FG_DETACHED   white
 set FLCLR_CLOCK_BG          $__256_blue
 set FLCLR_CLOCK_FG          white
 
-# Color for USERHOST segment
+# Color for USER and USERHOST segments
+set FLCLR_USER_BG           $__256_white
+set FLCLR_USER_FG           black
 set FLCLR_USERHOST_BG       $__256_white
 set FLCLR_USERHOST_FG       black
 
diff --git a/themes/default_ansi_colors.fish b/themes/default_ansi_colors.fish
index 7d48179..fc91436 100644
--- a/themes/default_ansi_colors.fish
+++ b/themes/default_ansi_colors.fish
@@ -47,7 +47,9 @@ set FLCLR_GIT_FG_DETACHED   normal
 set FLCLR_CLOCK_BG          white
 set FLCLR_CLOCK_FG          black
 
-# Color for USERHOST segment
+# Color for USER and USERHOST segments
+set FLCLR_USER_BG           cyan
+set FLCLR_USER_FG           normal
 set FLCLR_USERHOST_BG       cyan
 set FLCLR_USERHOST_FG       normal
 
diff --git a/themes/tty_compatible.fish b/themes/tty_compatible.fish
index 3482ea6..c3af5cb 100644
--- a/themes/tty_compatible.fish
+++ b/themes/tty_compatible.fish
@@ -100,7 +100,9 @@ set FLCLR_GIT_FG_DETACHED   red
 set FLCLR_CLOCK_BG          normal
 set FLCLR_CLOCK_FG          yellow
 
-# Color for USERHOST segment
+# Color for USER and USERHOST segments
+set FLCLR_USER_BG           normal
+set FLCLR_USER_FG           purple
 set FLCLR_USERHOST_BG       normal
 set FLCLR_USERHOST_FG       purple