W3m: Fix zws

Term: Add font support for mate-terminal

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,14 @@
 ## Description
 
-Only fill in the fields below if relevant. If you're
-suggesting a new feature then just a description will suffice.
+If you're suggesting a new feature then just a description will suffice.
 
 
 #### Neofetch version
 
 ## Screenshot
 
+## Config file
+
 ## Verbose log
 
 1. Run `neofetch -vv 2> neofetchlog`

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,11 +2,9 @@
 
 Only fill in the fields below if relevant.
 
+
 ## Features
 
 ## Issues
 
 ## TODO
-
-
-

.travis.yml

@@ -1,13 +1,23 @@
 language: bash
 sudo: required
 
+addons:
+    apt:
+        sources:
+            - debian-sid
+        packages:
+            - shellcheck
+
 os:
     - linux
     - osx
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update                  ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
 
 script:
-    - time ./neofetch --ascii --config travis --ascii_distro travis -v
+    - time ./neofetch --ascii --config config/travis -v
+    # See this wiki page for why we're disabling these errors.
+    # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010; fi

CHANGELOG.md

@@ -1,100 +1,41 @@
-This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more.
-
-This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine.
-
-[See the screenshot section below for more info.](#screenshots)
-
-The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output.
-
-Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function.
-
-Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out.
-
-Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :)
-
-
 ## Contributors
 
-- **[@konimex](https://github.com/konimex)**
+- **[@MatthewCox](https://github.com/MatthewCox)**
+- **[@dawidd6](https://github.com/dawidd6)**
+- **[@erikdubois](https://github.com/erikdubois)**
+- **[@mstraube](https://github.com/mstraube)**
 
 
 ## General
 
-- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)**
+- Minimum required BASH version is now 3.2.
+    - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.)
 
 
-## Info
+## Images
 
-**Distro**<br \>
-
-- Added support for Apricity OS.
-- Added support for GoboLinux. **[@konimex](https://github.com/konimex)**
-- Added support for SwagArch.
-- Added support for AOSC OS.
-- Added support for Parrot Security.
-- Fixed bug that caused Linux Mint systems to be identified as Ubuntu.
-- Fixed bug that caused CentOS systems to not be detected.
-
-**Memory**<br \>
-
-- [BSD] Fixed high memory output.
-
-**GPU**<br \>
-
-- [Linux] Fixed bug where sound card was detected as GPU.
-
-**Packages**<br \>
-
-- Only call `wc -l` once at the end of the function instead of calling it once per package manager.
-
-**Desktop Environment**<br \>
-
-- Show Cinnamon version.
-
-
-## Image
-
-- Changed default image mode to `ascii`.
-    - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode)
-
-
-## Wallpaper
-
-- Rewrote wallpaper function.
-- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`.
-- Added support for XFCE's wallpaper setter.
-- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)**
+- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second.
+    - This is a workaround to the images disappearing on resize and workspace switch.
+    - Use Ctrl+C to exit.
 
 
 ## Ascii
 
-![ubuntu](https://u.teknik.io/zILeY.png)
-<br \><sub>Old Ubuntu Logo vs New Ubuntu Logo</sub>
-
-- Updated Ubuntu logo to the latest version.
-    - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file.
-- `--ascii_colors` no longer changes text colors.
-- Added ascii art for Ubuntu-Budgie.
-    - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file.
-- Fixed bug causing RFRemix to use the incorrect ascii art.
+- Added Ubuntu-MATE ascii art.
+- Fixed ArchLabs ascii art.  **[@erikdubois](https://github.com/erikdubois)**
 
 
-## Screenshots
+## Info
 
-Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use.
+**Terminal Emulator**
 
-On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`.
+- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)**
+- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)**
 
-The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots.
+**GPU**
 
-- Automatically use whatever screenshot tool is available.
-- Added screenshot support to macOS
-- Added screenshot support to Haiku
+- [Linux] Fixed GPU sort.
 
+**Song**
 
-## Screenshot Upload
-
-- [teknik.io] Fixed images not uploading with the right filetype.
-- Changed default image upload host to `teknik.io`.
-    - teknik doesn't compress images whereas imgur does.
-    - You can change this back to imgur by using `--image_host imgur` or by editing your config file.
+- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)**

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Dylan Araps
+Copyright (c) 2016-2017 Dylan Araps
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,24 +1,20 @@
-PREFIX        ?=  /usr
-RM            ?=  rm -f
-INSTALL_DIR   ?=  install -m755 -d
-INSTALL_PROG  ?=  install -m755
-INSTALL_FILE  ?=  install -m644
+PREFIX = /usr
 
 all:
 	@echo Run \'make install\' to install Neofetch
 
 install:
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1
-	$(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
-	$(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
-	$(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config
-	$(INSTALL_FILE) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+	mkdir -p $(DESTDIR)/etc/neofetch
+	mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
+	cp -p neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
+	cp -p neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
+	cp -p config/config $(DESTDIR)/etc/neofetch/config
+	cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
 
 uninstall:
-	$(RM) $(DESTDIR)$(PREFIX)/bin/neofetch
-	$(RM) $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
-	$(RM) -r $(DESTDIR)$(PREFIX)/share/neofetch
-
-
+	rm -f $(DESTDIR)$(PREFIX)/bin/neofetch
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
+	rm -f -r $(DESTDIR)$(PREFIX)/share/neofetch
+	rm -f -r $(DESTDIR)/etc/neofetch

README.md

@@ -1,18 +1,22 @@
 # Neofetch
 
-[![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases)
+[![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch)
+[![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
+[![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases)
 
-Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ascii file of your choice. The main purpose of neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using and etc.
+Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using etc.
 
-Neofetch is highly customizable through the use of commandline flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info.
+Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info.
 
-Neofetch can be used on any OS that has BASH, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd` and `Windows (Cygwin/Windows 10 Linux subsystem)`.
+Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`.
 
 For more information:
 
 **https://github.com/dylanaraps/neofetch/wiki**
 
-![1](https://ipfs.pics/ipfs/QmTtF9Sx8o617QE88GH3Z4yX7mRyi4yS1hsMHyRVmn14vJ)
+![neofetch screenshot](https://u.teknik.io/KlBsD.png)
 
 
 ## Dependencies
@@ -44,7 +48,7 @@ https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
 
 ### Customizing the script using a custom alias
 
-If you don't want to use the config file you can customize almost everything using launch flags!
+If you don't want to use the config file you can customize almost everything using launch flags.
 
 Here's an example neofetch alias:
 
@@ -69,9 +73,9 @@ Thanks to:
 - [Packagers](https://github.com/dylanaraps/neofetch/issues/115)
     - Thanks for maintaining Neofetch packages.
 - Users
-    - Thanks for using my script!
+    - Thanks for using Neofetch!
 - [Screenfetch](https://github.com/KittyKatt/screenFetch):
-    - I've used some snippets as a base for a few functions in this script.
-    - Some of the ascii logos.
+    - We've used some snippets as a base for a few functions in this script.
+    - Some of the ASCII logos.
 - [ufetch](https://github.com/jschx/ufetch):
-    - Tiny ascii logos
+    - Tiny ASCII logos

ascii/distro/aix

@@ -0,0 +1,20 @@
+${c1}           `:+ssssossossss+-`
+        .oys///oyhddddhyo///sy+.
+      /yo:+hNNNNNNNNNNNNNNNNh+:oy/
+    :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h:
+  `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys
+ `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh
+ h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy
+/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m:
+h//NNNNNNN: . .NNNh  mNo  od. -dNNNNN:+y
+N.sNNNNNN+ -N/ -NNh  mNNd.   sNNNNNNNo-m
+N.sNNNNNs  +oo  /Nh  mNNs` ` /mNNNNNNo-m
+h//NNNNh  ossss` +h  md- .hm/ `sNNNNN:+y
+:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m-
+ yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss
+ `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy
+   sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo
+    :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh-
+      :ys:/yNNNNNNNNNNNNNNNmy/:sy:
+        .+ys///osyhhhhys+///sy+.
+            -/osssossossso/-

ascii/distro/alpine_small

@@ -0,0 +1,6 @@
+${c1}   /\\ /\\
+  /${c2}/ ${c1}\\  \\
+ /${c2}/   ${c1}\\  \\
+/${c2}//    ${c1}\\  \\
+${c2}//      ${c1}\\  \\
+         \\

ascii/distro/antix

@@ -0,0 +1,13 @@
+${c1}
+                    \
+         , - ~ ^ ~ - \        /
+     , '              \ ' ,  /
+   ,                   \   '/
+  ,                     \  / ,
+ ,___,                   \/   ,
+ /   |   _  _  _|_ o     /\   ,
+|,   |  / |/ |  |  |    /  \  ,
+ \,_/\_/  |  |_/|_/|_/_/    \,
+   ,                  /     ,\
+     ,               /  , '   \
+      ' - , _ _ _ ,  '

ascii/distro/arch

@@ -7,9 +7,9 @@ ${c1}                   -`
              `/:-:++oooo+:
             `/++++/+++++++:
            `/++++++++++++++:
-          `/+++ooooooooooooo/`
-         ./ooosssso++osssssso+`
-        .oossssso-````/ossssss+`
+          `/+++o${c2}oooooooo${c1}oooo/`
+${c2}         ${c1}./${c2}ooosssso++osssssso${c1}+`
+${c2}        .oossssso-````/ossssss+`
        -osssssso.      :ssssssso.
       :osssssss/        osssso+++.
      /ossssssss/        +ssssooo/-

ascii/distro/archbox

@@ -0,0 +1,19 @@
+${c1}              ...:+oh/:::..
+         ..-/oshhhhhh`   `::::-.
+     .:/ohhhhhhhhhhhh`        `-::::.
+ .+shhhhhhhhhhhhhhhhh`             `.::-.
+ /`-:+shhhhhhhhhhhhhh`            .-/+shh
+ /      .:/ohhhhhhhhh`       .:/ohhhhhhhh
+ /           `-:+shhh`  ..:+shhhhhhhhhhhh
+ /                 .:ohhhhhhhhhhhhhhhhhhh
+ /                  `hhhhhhhhhhhhhhhhhhhh
+ /                  `hhhhhhhhhhhhhhhhhhhh
+ /                  `hhhhhhhhhhhhhhhhhhhh
+ /                  `hhhhhhhhhhhhhhhhhhhh
+ /      .+o+        `hhhhhhhhhhhhhhhhhhhh
+ /     -hhhhh       `hhhhhhhhhhhhhhhhhhhh
+ /     ohhhhho      `hhhhhhhhhhhhhhhhhhhh
+ /:::+`hhhhoos`     `hhhhhhhhhhhhhhhhhs+`
+    `--/:`   /:     `hhhhhhhhhhhho/-
+             -/:.   `hhhhhhs+:-`
+                ::::/ho/-`

ascii/distro/archlabs

@@ -0,0 +1,18 @@
+${c1}                 sy
+                h--d
+               d---:
+               :----/N
+              :------/N
+            N/----:---+
+           N/---+/ :--:o
+          N/--:/    ::::s
+          +---       ::::s
+        N+---+        ::::s
+       N+----o  +:o   s::::s
+      N/----:: s:::s  h:::::s
+     N/----:::y::::+  o::::::o
+    N/---::::::::::s d::::::::+N
+    /--::::::::::::dd::::::::::+N
+   :-:::/+syhd  NNN N  dhys+/:::/
+ d::+ydN                      /s+/d
+arc                               y\\.

ascii/distro/bsd

@@ -16,4 +16,4 @@ ${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====|
               \       /       /\
          ${c5}______${c1}( (_  / \______/
        ${c5},'  ,-----'   |
-  `--{__________)
+       `--{__________)

ascii/distro/desaos

@@ -0,0 +1,16 @@
+${c1}███████████████████████
+███████████████████████
+███████████████████████
+███████████████████████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+████████               ███████
+██████████████████████████████
+██████████████████████████████
+████████████████████████
+████████████████████████
+████████████████████████

ascii/distro/grombyang

@@ -0,0 +1,18 @@
+${c1}            eeeeeeeeeeee
+         eeeeeeeeeeeeeeeee
+      eeeeeeeeeeeeeeeeeeeeeee
+    eeeee       ${c2}.o+       ${c1}eeee
+  eeee         ${c2}`ooo/         ${c1}eeee
+ eeee         ${c2}`+oooo:         ${c1}eeee
+eee          ${c2}`+oooooo:          ${c1}eee
+eee          ${c2}-+oooooo+:         ${c1}eee
+ee         ${c2}`/:oooooooo+:         ${c1}ee
+ee        ${c2}`/+   +++    +:        ${c1}ee
+ee              ${c2}+o+\             ${c1}ee
+eee             ${c2}+o+\            ${c1}eee
+eee        ${c2}//  \\ooo/  \\\        ${c1}eee
+ eee      ${c2}//++++oooo++++\\\     ${c1}eee
+  eeee    ${c2}::::++oooo+:::::   ${c1}eeee
+    eeeee   ${c3}Grombyang OS ${c1}  eeee
+      eeeeeeeeeeeeeeeeeeeeeee
+         eeeeeeeeeeeeeeeee

ascii/distro/mer

@@ -0,0 +1,27 @@
+${c1}                         dMs
+                         .-`
+                       `y`-o+`
+                        ``NMMy
+                      .--`:++.
+                    .hNNNNs
+                    /MMMMMN
+                    `ommmd/ +/
+                      ````  +/
+                     `:+sssso/-`
+  .-::. `-::-`     `smNMNmdmNMNd/      .://-`
+.ymNMNNdmNMMNm+`  -dMMh:.....+dMMs   `sNNMMNo
+dMN+::NMMy::hMM+  mMMo `ohhy/ `dMM+  yMMy::-
+MMm   yMM-  :MMs  NMN` `:::::--sMMh  dMM`
+MMm   yMM-  -MMs  mMM+ `ymmdsymMMMs  dMM`
+NNd   sNN-  -NNs  -mMNs-.--..:dMMh`  dNN
+---   .--`  `--.   .smMMmdddmMNdo`   .--
+                     ./ohddds+:`
+                     +h- `.:-.
+                     ./`.dMMMN+
+                        +MMMMMd
+                        `+dmmy-
+                      ``` .+`
+                     .dMNo-y.
+                     `hmm/
+                         .:`
+                         dMs

ascii/distro/minix

@@ -0,0 +1,17 @@
+${c2}   -sdhyo+:-`                -/syymm:
+   sdyooymmNNy.     ``    .smNmmdysNd
+   odyoso+syNNmysoyhhdhsoomNmm+/osdm/
+    :hhy+-/syNNmddhddddddmNMNo:sdNd:
+     `smNNdNmmNmddddddddddmmmmmmmy`
+   `ohhhhdddddmmNNdmddNmNNmdddddmdh-
+   odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd:
+ `+mNho:`   smmd/ sNNh :dmms`   -+ymmo.
+-od/       -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m-       yms:
++sms -.`    :so:  .NN+  :os/     .-`mNh:
+.-hyh+:////-     -sNNd:`    .--://ohNs-
+ `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/
+  -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms:
+    //oydNMMMMydMMNysNMMmsMMMMMNyo/`
+       ../-yNMMy--/::/-.sMMmos+.`
+           -+oyhNsooo+omy/```
+              `::ohdmds-`

ascii/distro/mx

@@ -0,0 +1,17 @@
+${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM
+MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM
+MMMMMMMMMN+    :mMMMMMMMMMNo` -dMMMMMMMM
+MMMMMMMMMMMs.   `oNMMMMMMh- `sNMMMMMMMMM
+MMMMMMMMMMMMN/    -hMMMN+  :dMMMMMMMMMMM
+MMMMMMMMMMMMMMh-    +ms. .sMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMN+`   `  +NMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMNMMd:    .dMMMMMMMMMMMMMMM
+MMMMMMMMMMMMm/-hMd-     `sNMMMMMMMMMMMMM
+MMMMMMMMMMNo`   -` :h/    -dMMMMMMMMMMMM
+MMMMMMMMMd:       /NMMh-   `+NMMMMMMMMMM
+MMMMMMMNo`         :mMMN+`   `-hMMMMMMMM
+MMMMMMh.            `oNMMd:    `/mMMMMMM
+MMMMm/                -hMd-      `sNMMMM
+MMNs`                   -          :dMMM
+Mm:                                 `oMM
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM

ascii/distro/nitrux

@@ -0,0 +1,18 @@
+${c1}`:/.
+`/yo
+`/yo
+`/yo      .+:.
+`/yo      .sys+:.`
+`/yo       `-/sys+:.`
+`/yo           ./sss+:.`
+`/yo              .:oss+:-`
+`/yo                 ./o///:-`
+`/yo              `.-:///////:`
+`/yo           `.://///++//-``
+`/yo       `.-:////++++/-`
+`/yo    `-://///++o+/-`
+`/yo `-/+o+++ooo+/-`
+`/s+:+oooossso/.`
+`//+sssssso:.
+`+syyyy+:`
+:+s+-

ascii/distro/obrevenge

@@ -0,0 +1,18 @@
+${c1}   __   __
+     _@@@@   @@@g_
+   _@@@@@@   @@@@@@
+  _@@@@@@M   W@@@@@@_
+ j@@@@P        ^W@@@@
+ @@@@L____  _____Q@@@@
+Q@@@@@@@@@@j@@@@@@@@@@
+@@@@@    T@j@    T@@@@@
+@@@@@ ___Q@J@    _@@@@@
+@@@@@fMMM@@j@jggg@@@@@@
+@@@@@    j@j@^MW@P @@@@
+Q@@@@@ggg@@f@   @@@@@@L
+^@@@@WWMMP  ^    Q@@@@
+ @@@@@_         _@@@@l
+  W@@@@@g_____g@@@@@P
+   @@@@@@@@@@@@@@@@l
+    ^W@@@@@@@@@@@P
+       ^TMMMMTll

ascii/distro/openbsd

@@ -7,8 +7,8 @@ ${c1}     / ||\| Y J  )   / |/| ./
     J  |)'( |        ` F`.'/       ${c3} _
 ${c1}  -<|  F         __     .-<        ${c3}(_)
 ${c1}    | /       .-'${c3}. ${c1}`.  /${c3}-. ${c1}L___
-    J \\      <    ${c3}\ ${c1} | | ${c5}O${c3}\\\\${c1}|.-' ${c3} _
-${c1}  _J \\  .-    \\\\${c3}/ ${c5}O ${c3}| ${c1}| \\  |${c1}F    ${c3}(_)
+    J \\      <    ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _
+${c1}  _J \\  .-    \\${c3}/ ${c5}O ${c3}| ${c1}| \\  |${c1}F    ${c3}(_)
 ${c1} '-F  -<_.     \\   .-'  `-' L__
 __J  _   _.     >-'  ${c1})${c4}._.   ${c1}|-'
 ${c1} `-|.'   /_.          ${c4}\_|  ${c1} F

ascii/distro/osmc

@@ -0,0 +1,20 @@
+${c1}            -+shdmNNNNmdhs+-
+        .+hMNho/:..``..:/ohNMh+.
+      :hMdo.                .odMh:
+    -dMy-                      -yMd-
+   sMd-                          -dMs
+  hMy       +.            .+       yMh
+ yMy        dMs.        .sMd        yMy
+:Mm         dMNMs`    `sMNMd        `mM:
+yM+         dM//mNs``sNm//Md         +My
+mM-         dM:  +NNNN+  :Md         -Mm
+mM-         dM: `oNN+    :Md         -Mm
+yM+         dM/+NNo`     :Md         +My
+:Mm`        dMMNs`       :Md        `mM:
+ yMy        dMs`         -ms        yMy
+  hMy       +.                     yMh
+   sMd-                          -dMs
+    -dMy-                      -yMd-
+      :hMdo.                .odMh:
+        .+hMNho/:..``..:/ohNMh+.
+            -+shdmNNNNmdhs+-

ascii/distro/parabola

@@ -1,17 +1,16 @@
-${c1}              eeeeeeeee
-          eeeeeeeeeeeeeee
-       eeeeee${c2}//////////${c1}eeeee
-     eeeee${c2}///////////////${c1}eeeee
-   eeeee${c2}///           ////${c1}eeee
-  eeee${c2}//              ///${c1}eeeee
- eee                 ${c2}///${c1}eeeee
-ee                  ${c2}//${c1}eeeeee
-e                  ${c2}/${c1}eeeeeee
-                  eeeeeee
-                 eeeeee
-                eeeeee
-               eeeee
-              eeee
-            eee
-           ee
-          e
+${c1}                          `.-.    `.
+                   `.`  `:++.   `-+o+.
+             `` `:+/. `:+/.   `-+oooo+
+        ``-::-.:+/. `:+/.   `-+oooooo+
+    `.-:///-  ..`   .-.   `-+oooooooo-
+ `..-..`                 `+ooooooooo:
+``                        :oooooooo/
+                          `ooooooo:
+                          `oooooo:
+                          -oooo+.
+                          +ooo/`
+                         -ooo-
+                        `+o/.
+                        /+-
+                       //`
+                      -.

ascii/distro/raspbian

@@ -1,18 +1,23 @@
-${c1}  .',;:cc;,'.    .,;::c:,,.
- ,ooolcloooo:  'oooooccloo:
- .looooc;;:ol  :oc;;:ooooo'
-   ;oooooo:      ,ooooooc.
-     .,:;'.       .;:;'.
-     ${c2}.... ..'''''. ....
-   .''.   ..'''''.  ..''.
-   ..  .....    .....  ..
-  .  .'''''''  .''''''.  .
-.'' .''''''''  .'''''''. ''.
-'''  '''''''    .''''''  '''
-.'    ........... ...    .'.
-  ....    ''''''''.   .''.
-  '''''.  ''''''''. .'''''
-   '''''.  .'''''. .'''''.
-    ..''.     .    .''..
-          .'''''''
-           ......
+${c1}  `.::///+:/-.        --///+//-:``
+ `+oooooooooooo:   `+oooooooooooo:
+  /oooo++//ooooo:  ooooo+//+ooooo.
+  `+ooooooo:-:oo-  +o+::/ooooooo:
+   `:oooooooo+``    `.oooooooo+-
+     `:++ooo/.        :+ooo+/.`
+        ${c2}...`  `.----.` ``..
+     .::::-``:::::::::.`-:::-`
+    -:::-`   .:::::::-`  `-:::-
+   `::.  `.--.`  `` `.---.``.::`
+       .::::::::`  -::::::::` `
+ .::` .:::::::::- `::::::::::``::.
+-:::` ::::::::::.  ::::::::::.`:::-
+::::  -::::::::.   `-::::::::  ::::
+-::-   .-:::-.``....``.-::-.   -::-
+ .. ``       .::::::::.     `..`..
+   -:::-`   -::::::::::`  .:::::`
+   :::::::` -::::::::::` :::::::.
+   .:::::::  -::::::::. ::::::::
+    `-:::::`   ..--.`   ::::::.
+      `...`  `...--..`  `...`
+            .::::::::::
+             `.-::::-`

ascii/distro/salentos

@@ -0,0 +1,20 @@
+${c1}                 ``..``
+        .-:+oshdNMMMMMMNdhyo+:-.`
+  -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/
+${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+`
+${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM-
+${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM`
+${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN`
+${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd
+${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy
+${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo
+${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/
+${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM-
+${c2}  mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN`
+${c2}  hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm
+${c2}  /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy
+${c2}   .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms:
+${c2}      `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+.
+${c2}          .+hMMMMMM${c4}hh${c3}MMMMMMdo:
+${c2}             `:smMM${c4}yy${c3}MMNy/`
+                 ${c2}.- ${c4}`${c3}:.

ascii/distro/slitaz

@@ -0,0 +1,17 @@
+${c1}        @    @(               @        
+      @@   @@                  @    @/ 
+     @@   @@                   @@   @@ 
+    @@  %@@                     @@   @@
+   @@  %@@@       @@@@@.       @@@@  @@
+  @@@    @@@@    @@@@@@@    &@@@    @@@
+   @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/
+       ,@@@@@@@@@@@@@@@@@@@@@@@@@      
+  .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/  
+@@@@@@.  @@@@@@@@@@@@@@@@@@@@@  /@@@@@@
+@@    @@@@@  @@@@@@@@@@@@,  @@@@@   @@@
+@@ @@@@.    @@@@@@@@@@@@@%    #@@@@ @@.
+@@ ,@@      @@@@@@@@@@@@@      @@@  @@ 
+@   @@.     @@@@@@@@@@@@@     @@@  *@  
+@    @@     @@@@@@@@@@@@      @@   @   
+      @      @@@@@@@@@.     #@         
+       @      ,@@@@@       @           

ascii/distro/smartos

@@ -0,0 +1,17 @@
+${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+yyyys             oyyyyyyyyyyyyyyyy
+yyyys  yyyyyyyyy  oyyyyyyyyyyyyyyyy
+yyyys  yyyyyyyyy  oyyyyyyyyyyyyyyyy
+yyyys  yyyyyyyyy  oyyyyyyyyyyyyyyyy
+yyyys  yyyyyyyyy  oyyyyyyyyyyyyyyyy
+yyyys  yyyyyyyyyyyyyyyyyyyyyyyyyyyy
+yyyyy                         syyyy
+yyyyyyyyyyyyyyyyyyyyyyyyyyyy  syyyy
+yyyyyyyyyyyyyyyy  syyyyyyyyy  syyyy
+yyyyyyyyyyyyyyyy  oyyyyyyyyy  syyyy
+yyyyyyyyyyyyyyyy  oyyyyyyyyy  syyyy
+yyyyyyyyyyyyyyyy  syyyyyyyyy  syyyy
+yyyyyyyyyyyyyyyy              yyyyy
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy

ascii/distro/travis

@@ -1,6 +0,0 @@
-${c1} _______        _
-${c2}|__   __|      | |
-${c3}   | | ___  ___| |_
-${c4}   | |/ _ \/ __| __|
-${c5}   | |  __/\__ \ |_
-${c6}   |_|\___||___/\__|

ascii/distro/trueos

@@ -0,0 +1,27 @@
+${c1}                       ..
+                        s.
+                        +y
+                        yN
+                       -MN  `.
+                      :NMs `m
+                    .yMMm` `No
+            `-/+++sdMMMNs+-`+Ms
+        `:oo+-` .yMMMMy` `-+oNMh
+      -oo-     +NMMMM/       oMMh-
+    .s+` `    oMMMMM/     -  oMMMhy.
+   +s`- ::   :MMMMMd     -o `mMMMy`s+
+  y+  h .Ny+oNMMMMMN/    sh+NMMMMo  +y
+ s+ .ds  -NMMMMMMMMMMNdhdNMMMMMMh`   +s
+-h .NM`   `hMMMMMMMMMMMMMMNMMNy:      h-
+y- hMN`     hMMmMMMMMMMMMNsdMNs.      -y
+m` mMMy`    oMMNoNMMMMMMo`  sMMMo     `m
+m` :NMMMdyydMMMMo+MdMMMs     sMMMd`   `m
+h-  `+ymMMMMMMMM--M+hMMN/    +MMMMy   -h
+:y     `.sMMMMM/ oMM+.yMMNddNMMMMMm   y:
+ y:   `s  dMMN- .MMMM/ :MMMMMMMMMMh  :y
+ `h:  `mdmMMM/  yMMMMs  sMMMMMMMMN- :h`
+   so  -NMMMN   /mmd+  `dMMMMMMMm- os
+    :y: `yMMM`       `+NMMMMMMNo`:y:
+      /s+`.omy      /NMMMMMNh/.+s:
+        .+oo:-.     /mdhs+::oo+.
+            -/o+++++++++++/-

ascii/distro/ubuntu-mate

@@ -0,0 +1,20 @@
+${c1}           `:+shmNNMMNNmhs+:`
+        .odMMMMMMMMMMMMMMMMMMdo.
+      /dMMMMMMMMMMMMMMMmMMMMMMMMd/
+    :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm:
+  `yMMMMMMMMMms:..-::oM:    -omMMMMMy`
+ `dMMMMMMMMy-.odNMMMMMM:    -odMMMMMMd`
+ hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh
+/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/
+hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh
+NMMMMm    `/yNMMMMMMMMMMMM: MM+ mMMMMMMN
+NMMMMm    `/yNMMMMMMMMMMMM: MM+ mMMMMMMN
+hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh
+/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/
+ hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh
+ `dMMMMMMMMy-.odNMMMMMM:    :smMMMMMMd`
+   yMMMMMMMMMms/..-::oM:    .+dMMMMMy
+    :mMMMMMMMMMMMMNNNNM: :smMMMMMMm:
+      /dMMMMMMMMMMMMMMMdNMMMMMMMd/
+        .odMMMMMMMMMMMMMMMMMMdo.
+           `:+shmNNMMNNmhs+:`

ascii/distro/ubuntu-studio

@@ -0,0 +1,20 @@
+${c1}              ..-::::::-.`
+         `.:+++++++++++${c2}ooo${c1}++:.`
+       ./+++++++++++++${c2}sMMMNdyo${c1}+/.
+     .++++++++++++++++${c2}oyhmMMMMms${c1}++.
+   `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/`
+  `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++`
+  +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++`
+ :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++:
+ ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++
+`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++.
+`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++.
+ ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++
+ :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++:
+  +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++
+  `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++`
+   `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/
+     ./+++++++++++++++${c2}oyhdNMMMms${c1}++.
+       ./+++++++++++++${c2}hMMMNdyo${c1}+/.
+         `.:+++++++++++${c2}sso${c1}++:.
+              ..-::::::-..

ascii/distro/void_small

@@ -0,0 +1,7 @@
+${c1}    _______
+ _ \______ -
+| \  ___  \ |
+| | /   \ | |
+| | \___/ | |
+| \______ \_|
+ -_______\

config/config

@@ -3,9 +3,6 @@
 # Neofetch config file
 # https://github.com/dylanaraps/neofetch
 
-# Speed up script by not using unicode
-export LC_ALL=C
-export LANG=C
 
 # See this wiki page for more info:
 # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
@@ -39,7 +36,8 @@ print_info() {
     # info "Local IP" local_ip
     # info "Public IP" public_ip
     # info "Users" users
-    # info "Birthday" birthday
+    # info "Install Date" install_date
+    # info "Locale" locale # This only works on glibc systems.
 
     info line_break
     info cols
@@ -92,7 +90,7 @@ os_arch="on"
 
 # Shorten the output of the uptime function
 #
-# Default: 'off'
+# Default: 'on'
 # Values:  'on', 'off', 'tiny'
 # Flag:    --uptime_shorthand
 #
@@ -100,7 +98,7 @@ os_arch="on"
 # on:   '2 days, 10 hours, 3 mins'
 # off:  '2 days, 10 hours, 3 minutes'
 # tiny: '2d 10h 3m'
-uptime_shorthand="off"
+uptime_shorthand="on"
 
 
 # Shell
@@ -134,11 +132,23 @@ shell_version="on"
 
 # CPU speed type
 #
-# Default: 'bios'
-# Values:  'current', 'min', 'max', 'bios',
+# Default: 'bios_limit'
+# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'.
 # Flag:    --speed_type
 # Supports: Linux with 'cpufreq'
-speed_type="bios"
+# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value.
+speed_type="bios_limit"
+
+# CPU speed shorthand
+#
+# Default: 'off'
+# Values: 'on', 'off'.
+# Flag:    --speed_shorthand.
+#
+# Example:
+# on:    'i7-6500U (4) @ 3.1GHz'
+# off:   'i7-6500U (4) @ 3.100GHz'
+speed_shorthand="off"
 
 # Shorten the output of the CPU function
 #
@@ -185,12 +195,13 @@ cpu_cores="logical"
 # Note the temperature is added to the regular CPU function.
 #
 # Default: 'off'
-# Values:  'on', 'off'
+# Values:  'C', 'F', 'off'
 # Flag:    --cpu_temp
 # Supports: Linux
 #
 # Example:
-# on:  'Intel i7-6500U (4) @ 3.1GHz [27.2°C]'
+# C:   'Intel i7-6500U (4) @ 3.1GHz [27.2°C]'
+# F:   'Intel i7-6500U (4) @ 3.1GHz [82.0°F]'
 # off: 'Intel i7-6500U (4) @ 3.1GHz'
 cpu_temp="off"
 
@@ -209,6 +220,25 @@ cpu_temp="off"
 # off: 'HD 7950'
 gpu_brand="on"
 
+# Which GPU to display
+#
+# Default: 'all'
+# Values:  'all', 'dedicated', 'integrated'
+# Flag:    --gpu_type
+# Supports: Linux
+#
+# Example:
+# all:
+#   GPU1: AMD HD 7950
+#   GPU2: Intel Integrated Graphics
+#
+# dedicated:
+#   GPU1: AMD HD 7950
+#
+# integrated:
+#   GPU1: Intel Integrated Graphics
+gpu_type="all"
+
 
 # Resolution
 
@@ -274,10 +304,52 @@ gtk3="on"
 public_ip_host="http://ident.me"
 
 
+# Disk
+
+
+# Which disks to display.
+# The values can be any /dev/sdXX, mount point or directory.
+# NOTE: By default we only show the disk info for '/'.
+#
+# Default: '/'
+# Values:  '/', '/dev/sdXX', '/path/to/drive'.
+# Flag:    --disk_show
+#
+# Example:
+# disk_show=('/' '/dev/sdb1'):
+#      'Disk (/): 74G / 118G (66%)'
+#      'Disk (/mnt/Videos): 823G / 893G (93%)'
+#
+# disk_show=('/'):
+#      'Disk (/): 74G / 118G (66%)'
+#
+disk_show=('/')
+
+# Disk subtitle.
+# What to append to the Disk subtitle.
+#
+# Default: 'mount'
+# Values:  'mount', 'name', 'dir'
+# Flag:    --disk_subtitle
+#
+# Example:
+# name:   'Disk (/dev/sda1): 74G / 118G (66%)'
+#         'Disk (/dev/sdb2): 74G / 118G (66%)'
+#
+# mount:  'Disk (/): 74G / 118G (66%)'
+#         'Disk (/mnt/Local Disk): 74G / 118G (66%)'
+#         'Disk (/mnt/Videos): 74G / 118G (66%)'
+#
+# dir:    'Disk (/): 74G / 118G (66%)'
+#         'Disk (Local Disk): 74G / 118G (66%)'
+#         'Disk (Videos): 74G / 118G (66%)'
+disk_subtitle="mount"
+
+
 # Song
 
 
-# Print the Artist and Title on seperate lines
+# Print the Artist and Title on separate lines
 #
 # Default: 'off'
 # Values:  'on', 'off'
@@ -291,38 +363,30 @@ public_ip_host="http://ident.me"
 song_shorthand="off"
 
 
-# Birthday
+# Install Date
 
 
-# Shorten the output of the Birthday functon.
-#
-# Default:  'off'
-# Values:   'on', 'off'
-# Flag:     --birthday_shorthand
-# Supports: 'off' doesn't work on OpenBSD and NetBSD.
-#
-# Example:
-# on:  'Thu 14 Apr 2016 11:50 PM'
-# off: '2016-04-14 23:50:55'
-birthday_shorthand="off"
-
 # Whether to show the time in the output
 #
 # Default:  'on'
 # Values:   'on', 'off'
-# Flag:     --birthday_time
+# Flag:     --install_time
 #
 # Example:
 # on:  'Thu 14 Apr 2016 11:50 PM'
 # off: 'Thu 14 Apr 2016'
-birthday_time="on"
+install_time="on"
 
-# Date format to use when printing birthday
+# Set time format in the output
 #
-# Default:  '+%a %d %b %Y %l:%M %p'
-# Values:   'date format'
-# Flag:     --birthday_format
-birthday_format="+%a %d %b %Y %l:%M %p"
+# Default: '24h'
+# Values:  '12h', '24h'
+# Flag:    --install_time_format
+#
+# Example:
+# 12h: 'Thu 14 Apr 2016 11:50 PM'
+# 24h: 'Thu 14 Apr 2016 23:50'
+install_time_format="12h"
 
 
 # Text Colors
@@ -372,8 +436,7 @@ underline_char="-"
 
 
 # Color block range
-# Start/End refer to the range of colors
-# to print in the blocks.
+# The range of colors to print.
 #
 # Default:  '0', '7'
 # Values:   'num'
@@ -381,13 +444,12 @@ underline_char="-"
 #
 # Example:
 #
-# Display colors 0-7 in the blocks.
+# Display colors 0-7 in the blocks.  (8 colors)
 # neofetch --block_range 0 7
 #
-# Display colors 0-15 in the blocks.
+# Display colors 0-15 in the blocks. (16 colors)
 # neofetch --block_range 0 15
-start=0
-end=7
+block_range=(0 7)
 
 # Toggle color blocks
 #
@@ -476,17 +538,79 @@ battery_display="off"
 disk_display="off"
 
 
-# Image Options
+# Backend Settings
 
 
+# Image backend.
+#
+# Default:  'ascii'
+# Values:   'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m'
+# Flag:     --backend
+image_backend="ascii"
+
 # Image Source
 #
-# Default:  'ascii'
-# Values:   'ascii', 'wallpaper', '/path/to/img', '/path/to/dir/', 'off'
-# Flag:     --image
+# Which image or ascii file to display.
 #
-# NOTE: Change this to 'wallpaper', '/path/to/img' or /path/to/dir/' to enable image mode. You can also launch neofetch with '--image wallpaper' and etc.
-image_source="ascii"
+# Default:  'auto'
+# Values:   'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+# Flag:     --source
+#
+# NOTE: 'auto' will pick the best image source for whatever image backend is used.
+#       In ascii mode, distro ascii art will be used and in an image mode, your
+#       wallpaper will be used.
+image_source="auto"
+
+
+# Ascii Options
+
+
+# Ascii distro
+# Which distro's ascii art to display.
+#
+# Default: 'auto'
+# Values:  'auto', 'distro_name'
+# Flag:    --ascii_distro
+#
+# NOTE: Arch and Ubuntu have 'old' logo variants.
+#       Change this to 'arch_old' or 'ubuntu_old' to use the old logos.
+# NOTE: Ubuntu has flavor variants.
+#       Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors.
+# NOTE: Arch, Crux and Gentoo have a smaller logo variant.
+#       Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos.
+ascii_distro="auto"
+
+# Ascii Colors
+#
+# Default:  'distro'
+# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
+# Flag:     --ascii_colors
+#
+# Example:
+# ascii_colors=(distro)      - Ascii is colored based on Distro colors.
+# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors.
+ascii_colors=(distro)
+
+# Bold ascii logo
+# Whether or not to bold the ascii logo.
+#
+# Default: 'on'
+# Values:  'on', 'off'
+# Flag:    --ascii_bold
+ascii_bold="on"
+
+
+# Image Options
+
+
+# Image loop
+# Setting this to on will make neofetch redraw the image constantly until
+# Ctrl+C is pressed. This fixes display issues in some terminal emulators.
+#
+# Default:  'off'
+# Values:   'on', 'off'
+# Flag:     --loop
+image_loop="off"
 
 # Thumbnail directory
 #
@@ -494,22 +618,6 @@ image_source="ascii"
 # Values:  'dir'
 thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch"
 
-# w3m-img path
-# Only works with the w3m backend.
-#
-# NOTE: Only change this if "neofetch -v" says that it "couldn't find w3m-img".
-# Neofetch has a function that automatically finds w3m-img for you. It looks
-# in the following directories:
-#    /usr/lib/w3m/w3mimgdisplay
-#    /usr/libexec/w3m/w3mimgdisplay
-#    /usr/lib64/w3m/w3mimgdisplay
-#    /usr/libexec64/w3m/w3mimgdisplay
-# If w3m-img is installed elsewhere on your system, open an issue on the repo
-# and I'll add it to the function inside the script. If w3m-img is installed
-# in a non-standard way (in your home folder, etc) then change the variable
-# below to the custom location. Otherwise, don't touch this.
-w3m_img_path="/usr/lib/w3m/w3mimgdisplay"
-
 # Crop mode
 #
 # Default:  'normal'
@@ -564,61 +672,6 @@ xoffset=0
 background_color=
 
 
-# Ascii Options
-
-
-# Default ascii image to use
-# When this is set to distro it will use your
-# distro's logo as the ascii.
-#
-# Default: 'distro'
-# Values:  'distro', '/path/to/ascii_file'
-# Flag:    --ascii
-ascii="distro"
-
-# Ascii distro
-# Which distro's ascii art to display.
-#
-# Default: 'auto'
-# Values:  'auto', 'distro_name'
-# Flag:    --ascii_distro
-#
-# NOTE: Arch and Ubuntu have 'old' logo varients.
-#       Change this to 'arch_old' or 'ubuntu_old' to use the old logos.
-# NOTE: Ubuntu has flavor varients.
-#       Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors.
-ascii_distro="auto"
-
-# Ascii Colors
-#
-# Default:  'distro'
-# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
-# Flag:     --ascii_colors
-#
-# Example:
-# ascii_colors=(distro)      - Ascii is colored based on Distro colors.
-# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors.
-ascii_colors=(distro)
-
-# Logo size
-# Arch, Crux and Gentoo have a smaller logo
-# variant. Changing the value below to small
-# will make neofetch use the small logo.
-#
-# Default: 'normal'
-# Values:  'normal', 'small'
-# Flag:    --ascii_logo_size
-ascii_logo_size="normal"
-
-# Bold ascii logo
-# Whether or not to bold the ascii logo.
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --ascii_bold
-ascii_bold="on"
-
-
 # Scrot Options
 
 
@@ -644,16 +697,6 @@ scrot="off"
 # Flag:    --scrot_cmd
 scrot_cmd="auto"
 
-# Screenshot Directory
-# Where to save the screenshots
-#
-# Default: '~/Pictures/'
-# Values:  'dir'
-# Flag:    --scrot_dir
-#
-# Note: Neofetch won't create the directory if it doesn't exist.
-scrot_dir="$HOME/Pictures/"
-
 # Screenshot Filename
 # What to name the screenshots
 #
@@ -674,28 +717,11 @@ scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png"
 image_host="teknik"
 
 
-# Config Options
+# Misc Options
 
 
-# Enable/Disable config file
+# Config version.
 #
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --config
-# --config off, none
-#
-# Note: This option is only used when neofetch sources this config
-# as a default config and NOT as a user config. Changing this in
-# your user config won't actually do anything.
-config="on"
-
-# Path to custom config file location
-#
-# Default: '${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config'
-# Values:  '/path/to/config'
-# Flag:    --config_file
-#
-# Note: This option is only used when neofetch sources this config
-# as a default config and NOT as a user config. Changing this in
-# your user config won't actually do anything.
-config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config"
+# NOTE: Don't change this value, neofetch reads this to determine
+# how to handle backwards compatibility.
+config_version="3.1.0-git"

config/travis

@@ -33,11 +33,19 @@ print_info() {
     info "Local IP" local_ip
     info "Public IP" public_ip
     info "Users" users
-    info "Birthday" birthday
+    info "Install Date" install_date
 
     info line_break
     info cols
     info line_break
+
+    # Testing.
+    prin "prin"
+    prin "prin" "prin"
+
+    # Testing no subtitles.
+    info uptime
+    info disk
 }
 
 refresh_rate="on"
@@ -45,4 +53,4 @@ shell_version="on"
 cpu_display="infobar"
 memory_display="infobar"
 disk_display="infobar"
-cpu_temp="on"
+cpu_temp="C"

neofetch.1

@@ -1,317 +1,343 @@
-.TH NEOFETCH "1" "December 2016" "2.0.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH NEOFETCH "1" "April 2017" "Neofetch 3.1.0-git" "User Commands"
 .SH NAME
-neofetch \- simple system information script
-
+Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
-.B neofetch \fR[Optional Flags]
-
+.B neofetch
+\fI\,--option "value" --option "value"\/\fR
 .SH DESCRIPTION
-neofetch is a script that gathers information about your system and prints
-it to the terminal next to an image, a distro's logo or any ASCII art of
-your choice.
-
+Neofetch is a CLI system information tool written in BASH. Neofetch
+displays information about your system next to an image, your OS logo,
+or any ASCII file of your choice.
+.PP
+NOTE: Every launch flag has a config option.
 .SH OPTIONS
+.SS "INFO:"
 .TP
-.B \--disable 'infoname'
-Allows you to disable an info line from appearing in the output.
-.br
-NOTE: You can supply multiple args. eg.
-.br
-\'neofetch --disable cpu gpu disk shell\'
-.br
-NOTE: The arguments must all be lowercase.
+\fB\-\-disable\fR infoname
+Allows you to disable an info line from appearing
+in the output.
+.IP
+NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu disk shell'
 .TP
-.B \--os_arch 'on/off'
+\fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
 .TP
-.B \--speed_type 'type'
+\fB\-\-speed_type\fR type
 Change the type of cpu speed to display.
-.br
 Possible values: current, min, max, bios,
 scaling_current, scaling_min, scaling_max
-.br
-NOTE: This only support Linux with cpufreq.
+.IP
+NOTE: This only supports Linux with cpufreq.
 .TP
-.B \--cpu_shorthand 'type'
+\fB\-\-speed_shorthand\fR on/off
+Whether or not to show decimals in CPU speed.
+.TP
+\fB\-\-cpu_shorthand\fR type
 Shorten the output of CPU
-.br
 Possible values: name, speed, tiny, on, off
 .TP
-.B \--cpu_cores 'logical/physical/off'
+\fB\-\-cpu_cores\fR type
 Whether or not to display the number of CPU cores
-.br
-Note: 'physical' doesn't work on BSD.
+Possible values: logical, physical, off
+.IP
+NOTE: 'physical' doesn't work on BSD.
 .TP
-.B \--cpu_speed 'on/off'
+\fB\-\-cpu_speed\fR on/off
 Hide/Show cpu speed.
 .TP
-.B \--cpu_temp 'on/off'
+\fB\-\-cpu_temp\fR C/F/off
 Hide/Show cpu temperature.
-.br
+.IP
 NOTE: This only works on Linux and BSD.
-.br
-NOTE: For FreeBSD-based systems, you need to enable coretemp kernel module.
+.IP
+NOTE: For FreeBSD\-based systems, you need to enable coretemp kernel module.
 .TP
-.B \--distro_shorthand 'on/off'
+\fB\-\-distro_shorthand\fR on/off
 Shorten the output of distro (tiny, on, off)
-.br
+.IP
 NOTE: This option won't work in Windows (Cygwin)
 .TP
-.B \--kernel_shorthand 'on/off'
+\fB\-\-kernel_shorthand\fR on/off
 Shorten the output of kernel
-.br
-NOTE: This option won't work in BSDs (except PacBSD and PC-BSD)
+.IP
+NOTE: This option won't work in BSDs (except PacBSD and PC\-BSD)
 .TP
-.B \--uptime_shorthand 'on/off'
+\fB\-\-uptime_shorthand\fR on/off
 Shorten the output of uptime (tiny, on, off)
 .TP
-.B \--refresh_rate 'on/off'
+\fB\-\-refresh_rate\fR on/off
 Whether to display the refresh rate of each monitor
-.br
-Note: Unsupported on Windows
+Unsupported on Windows
 .TP
-.B \--gpu_brand on/off
+\fB\-\-gpu_brand\fR on/off
 Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel)
 .TP
-.B \--gtk_shorthand 'on/off'
+\fB\-\-gpu_type\fR type
+Which GPU to display. (all, dedicated, integrated)
+.IP
+NOTE: This only supports Linux.
+.TP
+\fB\-\-gtk_shorthand\fR on/off
 Shorten output of gtk theme/icons
 .TP
-.B \--gtk2 'on/off'
-Enable/Disable GTK2 theme/icons output
+\fB\-\-gtk2\fR on/off
+Enable/Disable gtk2 theme/font/icons output
 .TP
-.B \--gtk3 'on/off'
-Enable/Disable gtk3 theme/icons output
+\fB\-\-gtk3\fR on/off
+Enable/Disable gtk3 theme/font/icons output
 .TP
-.B \--shell_path 'on/off'
+\fB\-\-shell_path\fR on/off
 Enable/Disable showing $SHELL path
 .TP
-.B \--shell_version 'on/off'
+\fB\-\-shell_version\fR on/off
 Enable/Disable showing $SHELL version
 .TP
-.B \--ip_host 'url'
+\fB\-\-disk_show\fR value
+Which disks to display.
+Possible values: '/', '/dev/sdXX', '/path/to/mount point'
+.IP
+NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1')
+.TP
+\fB\-\-disk_subtitle\fR type
+What information to append to the Disk subtitle.
+Takes: name, mount, dir
+.IP
+\&'name' shows the disk's name (sda1, sda2, etc)
+.IP
+\&'mount' shows the disk's mount point (/, \fI\,/mnt/Local\/\fP Disk, etc)
+.IP
+\&'dir' shows the basename of the disks's path. (/, Local Disk, etc)
+.TP
+\fB\-\-ip_host\fR url
 URL to query for public IP
 .TP
-.B \--song_shorthand 'on/off'
-Print the Artist/Title on seperate lines
+\fB\-\-song_shorthand\fR on/off
+Print the Artist/Title on separate lines
 .TP
-.B \--birthday_shorthand 'on/off'
-Shorten the output of birthday
+\fB\-\-install_time\fR on/off
+Enable/Disable showing the time in Install Date output.
 .TP
-.B \--birthday_time 'on/off'
-Enable/Disable showing the time in birthday output
+\fB\-\-install_time_format\fR 12h/24h
+Set time format in Install Date to be 12 hour or 24 hour.
+.SS "TEXT FORMATTING:"
 .TP
-.B \--birthday_format 'format'
-Format the birthday output. (Uses 'date' cmd format)
-
-.SH TEXT FORMATTING
-.TP
-.B \--colors x x x x x x
+\fB\-\-colors\fR x x x x x x
 Changes the text colors in this order:
 title, @, underline, subtitle, colon, info
 .TP
-.B \--underline on/off
-enable/disable the underline.
+\fB\-\-underline\fR on/off
+Enable/Disable the underline.
 .TP
-.B \--underline_char 'char'
+\fB\-\-underline_char\fR char
 Character to use when underlining title
 .TP
-.B \--bold 'on/off'
+\fB\-\-bold\fR on/off
 Enable/Disable bold text
+.SS "COLOR BLOCKS:"
 .TP
-.B \--prompt_height 'num'
-Set this to your prompt height to fix issues
-with the text going off screen at the top
-
-.SH COLOR BLOCKS
-.TP
-.B \--color_blocks 'on/off'
+\fB\-\-color_blocks\fR on/off
 Enable/Disable the color blocks
 .TP
-.B \--block_width 'num'
+\fB\-\-block_width\fR num
 Width of color blocks in spaces
 .TP
-.B \--block_height 'num'
+\fB\-\-block_height\fR num
 Height of color blocks in lines
 .TP
-.B \--block_range 'start' 'end'
+\fB\-\-block_range\fR num num
 Range of colors to print as blocks
-
-.SH BARS
+.SS "BARS:"
 .TP
-.B \--bar_char 'elapsed char' 'total char'
+\fB\-\-bar_char\fR 'elapsed char' 'total char'
 Characters to use when drawing bars.
 .TP
-.B \--bar_border on/off
+\fB\-\-bar_border\fR on/off
 Whether or not to surround the bar with '[]'
 .TP
-.B \--bar_length 'num'
+\fB\-\-bar_length\fR num
 Length in spaces to make the bars.
 .TP
-.B \--bar_colors 'num' 'num'
+\fB\-\-bar_colors\fR num num
 Colors to make the bar.
-.br
 Set in this order: elapsed, total
 .TP
-.B \--cpu_display       'mode'
+\fB\-\-cpu_display\fR mode
 Bar mode.
-.br
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
-.B \--memory_display    'mode'
+\fB\-\-memory_display\fR mode
 Bar mode.
-.br
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
-.B \--battery_display   'mode'
+\fB\-\-battery_display\fR mode
 Bar mode.
-.br
-Takes: bar, infobar, barinfo, off
+Possible values: bar, infobar, barinfo, off
 .TP
-.B \--disk_display      'mode'
+\fB\-\-disk_display\fR mode
 Bar mode.
-.br
-Takes: bar, infobar, barinfo, off
-
-.SH IMAGE
+Possible values: bar, infobar, barinfo, off
+.SS "IMAGE BACKEND:"
 .TP
-.B \--image 'type'
-Image source. Where and what image we display.
-.br
-Possible values: wall, ascii, /path/to/img, /path/to/dir/, off
+\fB\-\-backend\fR backend
+Which image backend to use.
+Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'sixel', 'tycat', 'w3m'
 .TP
-.B \--size 'size'
+\fB\-\-source\fR source
+Which image or ascii file to use.
+Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+.TP
+\fB\-\-ascii\fR source
+Shortcut to use 'ascii' backend.
+.TP
+\fB\-\-caca\fR source
+Shortcut to use 'caca' backend.
+.TP
+\fB\-\-catimg\fR source
+Shortcut to use 'catimg' backend.
+.TP
+\fB\-\-iterm2\fR source
+Shortcut to use 'iterm2' backend.
+.TP
+\fB\-\-jp2a\fR source
+Shortcut to use 'jp2a' backend.
+.TP
+\fB\-\-sixel\fR source
+Shortcut to use 'sixel' backend.
+.TP
+\fB\-\-termpix\fR source
+Shortcut to use 'termpix' backend.
+.TP
+\fB\-\-tycat\fR source
+Shortcut to use 'tycat' backend.
+.TP
+\fB\-\-w3m\fR source
+Shortcut to use 'w3m' backend.
+.TP
+\fB\-\-off\fR
+Shortcut to use 'off' backend.
+.IP
+NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
+.SS "ASCII:"
+.TP
+\fB\-\-ascii_colors\fR x x x x x x
+Colors to print the ascii art
+.TP
+\fB\-\-ascii_distro\fR distro
+Which Distro's ascii art to print
+.IP
+NOTE: Arch and Ubuntu have 'old' logo variants.
+.IP
+NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos.
+.IP
+NOTE: Ubuntu has flavor variants.
+.IP
+NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', 'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors.
+.IP
+NOTE: Alpine, Arch, Crux, Gentoo, OpenBSD, and Void have a smaller logo variant.
+.IP
+NOTE: Change this to 'alpine_small', 'arch_small', 'crux_small', 'gentoo_small', 'openbsd_small', and 'void_small' to use the small logos.
+.TP
+\fB\-\-ascii_bold\fR on/off
+Whether or not to bold the ascii logo.
+.TP
+\fB\-L\fR, \fB\-\-logo\fR
+Hide the info text and only show the ascii logo.
+.IP
+Possible values: bar, infobar, barinfo, off
+.SS "IMAGE:"
+.TP
+\fB\-\-loop\fR
+Redraw the image constantly until Ctrl+C is used. This fixes issues in some terminals emulators when using image mode.
+.TP
+\fB\-\-size\fR 00px | \fB\-\-size\fR 00%
 How to size the image.
-.br
 Possible values: auto, 00px, 00%, none
 .TP
-.B \--crop_mode 'mode'
+\fB\-\-crop_mode\fR mode
 Which crop mode to use
-.br
 Takes the values: normal, fit, fill
 .TP
-.B \--crop_offset 'value'
+\fB\-\-crop_offset\fR value
 Change the crop offset for normal mode.
-.br
 Possible values: northwest, north, northeast,
 west, center, east, southwest, south, southeast
 .TP
-.B \--xoffset 'value'
+\fB\-\-xoffset\fR px
 How close the image will be to the left edge of the
-window in pixel. This only works with w3m.
+window. This only works with w3m.
 .TP
-.B \--yoffset 'value'
-How close the image will be to the top edge
-of the window. This only works with w3m.
+\fB\-\-yoffset\fR px
+How close the image will be to the top edge of the
+window. This only works with w3m.
 .TP
-.B \--bg_color 'color'
+\fB\-\-bg_color\fR color
 Background color to display behind transparent image.
 This only works with w3m.
 .TP
-.B \--gap 'num'
+\fB\-\-gap\fR num
 Gap between image and text.
-.br
-NOTE: --gap can take a negative value which
-will move the text closer to the left side.
+.IP
+NOTE: \fB\-\-gap\fR can take a negative value which will move the text closer to the left side.
 .TP
-.B \--clean
+\fB\-\-clean\fR
 Delete cached files and thumbnails.
-
-.SH ASCII
+.SS "SCREENSHOT:"
 .TP
-.B \--ascii 'value'
-Where to get the ASCII from
-.br
-Possible values: distro, /path/to/ascii
+\fB\-s\fR, \fB\-\-scrot\fR \fI\,/path/to/img\/\fP
+Take a screenshot, if path is left empty the screenshot function will use $scrot_dir and $scrot_name.
 .TP
-.B \--ascii_colors x x x x x x
-Colors to print the ASCII art
+\fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP
+Same as \fB\-\-scrot\fR but uploads the scrot to a website.
 .TP
-.B \--ascii_distro 'distro'
-Which Distro\'s ASCII art to print
-.br
-NOTE: Arch and Ubuntu have 'old' logo varients.
-.br
-NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos.
-.br
-NOTE: Ubuntu has flavor varients.
-.br
-NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors.
+\fB\-\-image_host\fR imgur/teknik
+Website to upload scrots to.
 .TP
-.B \--ascii_logo_size 'size'
-Size of ascii logo.
-Supported distros: Arch, Gentoo, Crux, OpenBSD.
-Possible values: small, normal
-.TP
-.B \--ascii_bold 'on/off'
-Whether or not to bold the ascii logo.
-.TP
-.B \--logo | -L
-Hide the info text and only show the ascii logo.
-
-.SH SCREENSHOT
-.TP
-.B \--scrot 'path'
-Take a screenshot, if path is left empty the screenshot
-function will use $scrot_dir and $scrot_name.
-.TP
-.B \--upload | -su 'path'
-Same as --scrot but uploads the scrot to a website.
-.TP
-.B \--image_host 'host'
-Website to upload scrots to. Takes: imgur, teknik
-.TP
-.B \--scrot_cmd 'cmd'
+\fB\-\-scrot_cmd\fR cmd
 Screenshot program to launch
-
-.SH OTHER
+.SS "OTHER:"
 .TP
-.B \--config 'path'
+\fB\-\-config\fR \fI\,/path/to/config\/\fP
 Specify a path to a custom config file
 .TP
-.B \--config none
+\fB\-\-config\fR none
 Launch the script without a config file
 .TP
-.B \--help
+\fB\-\-help\fR
+Print this text and exit
 .TP
-.B \--test
-Launch the script with all functions / options enabled.
-This should only be used for testing purposes, ie Travis.CI.
+\fB\-\-version\fR
+Show neofetch version
 .TP
-.B \--version
-Show neofetch version.
-.TP
-.B \-v
+\fB\-v\fR
 Display error messages.
 .TP
-.B \-vv
+\fB\-vv\fR
 Display a verbose log for error reporting.
-
-.SH "SEE ALSO"
-http://github.com/dylanaraps/neofetch
-
-.SH BUGS
-Report bugs to <https://github.com/dylanaraps/neofetch/issues>
-
-.SH LICENSE
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Dylan Araps
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
+.SS "DEVELOPER:"
+.TP
+\fB\-\-gen\-man\fR
+Generate a manpage for Neofetch in your PWD. (Requires GNU help2man)
 .SH AUTHOR
-Created by Dylan Araps.
+Written by Dylan Araps with help from the following people:
+.PP
+https://github.com/dylanaraps/neofetch/contributors
+.SH "REPORTING BUGS"
+Report bugs to https://github.com/dylanaraps/neofetch/issues
+.SH COPYRIGHT
+Copyright \(co 2016\-2017 Dylan Araps
+.PP
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the 'Software'), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+.PP
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.