diff --git a/hyperglass/configuration/commands.yaml.example b/hyperglass/configuration/commands.yaml.example
index 4e74c2d..3087873 100644
--- a/hyperglass/configuration/commands.yaml.example
+++ b/hyperglass/configuration/commands.yaml.example
@@ -1,4 +1,29 @@
 ---
+# arista:
+#   ipv4_default:
+#     bgp_aspath: show ip bgp regexp {target}
+#     bgp_community: show ip bgp community {target}
+#     bgp_route: show ip bgp {target}
+#     ping: ping ip {target} source {source}
+#     traceroute: traceroute ip {target} source {source}
+#   ipv4_vpn:
+#     bgp_aspath: show ip bgp regexp {target} vrf {vrf}
+#     bgp_community: show ip bgp community {target} vrf {vrf}
+#     bgp_route: show ip bgp {target} vrf {vrf}
+#     ping: ping vrf {vrf} ip {target} source {source}
+#     traceroute: traceroute vrf {vrf} ip {target} source {source}
+#   ipv6_default:
+#     bgp_aspath: show ipv6 bgp regexp {target}
+#     bgp_community: show ipv6 bgp community {target}
+#     bgp_route: show ipv6 bgp {target}
+#     ping: ping ipv6 {target} source {source}
+#     traceroute: traceroute ipv6 {target} source {source}
+#   ipv6_vpn:
+#     bgp_aspath: show ipv6 bgp regexp {target} vrf {vrf}
+#     bgp_community: show ipv6 bgp community {target} vrf {vrf}
+#     bgp_route: show ipv6 bgp {target} vrf {vrf}
+#     ping: ping vrf {vrf} ipv6 {target} source {source}
+#     traceroute: traceroute vrf {vrf} ipv6 {target} source {source}
 # cisco_ios:
 #   ipv4_default:
 #     bgp_aspath: show bgp ipv4 unicast quote-regexp "{target}"
@@ -6,7 +31,7 @@
 #     bgp_route: show bgp ipv4 unicast {target} | exclude pathid:|Epoch
 #     ping: ping {target} repeat 5 source {source}
 #     traceroute: traceroute {target} timeout 1 probe 2 source {source}
-#   ipv4_vrf:
+#   ipv4_vpn:
 #     bgp_aspath: show bgp vpnv4 unicast vrf {vrf} quote-regexp "{target}"
 #     bgp_community: show bgp vpnv4 unicast vrf {vrf} community {target}
 #     bgp_route: show bgp vpnv4 unicast vrf {vrf} {target}
@@ -18,26 +43,37 @@
 #     bgp_route: show bgp ipv6 unicast {target} | exclude pathid:|Epoch
 #     ping: ping {afi} {target} repeat 5 source {source}
 #     traceroute: traceroute ipv6 {target} timeout 1 probe 2 source {source}
-#   ipv6_vrf:
+#   ipv6_vpn:
 #     bgp_aspath: show bgp vpnv6 unicast vrf {vrf} quote-regexp "{target}"
 #     bgp_community: show bgp vpnv6 unicast vrf {vrf} community {target}
 #     bgp_route: show bgp vpnv6 unicast vrf {vrf} {target}
 #     ping: ping vrf {vrf} {target} repeat 5 source {source}
 #     traceroute: traceroute vrf {vrf} {target} timeout 1 probe 2 source {source}
-
 # cisco_xr:
-#   dual:
-#     bgp_aspath: show bgp all unicast regexp {target} | utility egrep -v "\(BGP |Table|Non-stop\)"
-#     bgp_community: show bgp all unicast community {target} | utility egrep -v "\(BGP|Table |Non-stop\)"
-#   ipv4:
-#     bgp_route: show bgp ipv4 unicast {target} | util egrep \(BGP routing table entry|Path\#|aggregated by|Origin |Community:|validity| from \)
-#     ping: ping ipv4 {target} count 5 source {src_addr_ipv4}
+#   ipv4_default:
+#     bgp_aspath: show bgp ipv4 unicast regexp {target} | utility egrep -v \\(BGP |Table|Non-stop\\)
+#     bgp_community: show bgp ipv4 unicast community {target} | utility egrep -v \\(BGP|Table |Non-stop\\)
+#     bgp_route: show bgp ipv4 unicast {target} | util egrep \\(BGP routing table entry|Path\\#|aggregated by|Origin |Community:|validity| from \\)
+#     ping: ping ipv4 {target} count 5 source {source}
 #     traceroute: traceroute ipv4 {target} timeout 1 probe 2 source {source}
-#   ipv6:
-#     bgp_route: show bgp ipv6 unicast {target} | util egrep \(BGP routing table entry|Path\#|aggregated by|Origin |Community:|validity| from \)
-#     ping: ping ipv6 {target} count 5 source {src_addr_ipv6}
+#   ipv4_vpn:
+#     bgp_aspath: show bgp vpnv4 unicast vrf {vrf} regexp {target} | utility egrep -v \\(BGP |Table |Non-stop\\)
+#     bgp_community: show bgp vpnv4 unicast vrf {vrf} community {target} | utility egrep -v \\(BGP |Table |Non-stop\\)
+#     bgp_route: show bgp vpnv4 unicast vrf {vrf} {target} | util egrep \\(BGP routing table entry|Path \\#|aggregated by|Origin |Community:|validity| from \\)
+#     ping: ping vrf {vrf} {target} count 5 source {source}
+#     traceroute: traceroute vrf {vrf} {target} timeout 1 probe 2 source {source}
+#   ipv6_default:
+#     bgp_aspath: show bgp ipv6 unicast regexp {target} | utility egrep -v \\(BGP |Table|Non-stop\\)
+#     bgp_community: show bgp ipv6 unicast community {target} | utility egrep -v \\(BGP|Table |Non-stop\\)
+#     bgp_route: show bgp ipv6 unicast {target} | util egrep \\(BGP routing table entry|Path\\#|aggregated by|Origin |Community:|validity| from \\)
+#     ping: ping ipv6 {target} count 5 source {source}
 #     traceroute: traceroute ipv6 {target} timeout 1 probe 2 source {source}
-
+#   ipv6_vpn:
+#     bgp_aspath: show bgp vpnv6 unicast vrf {vrf} regexp {target} | utility egrep -v \\(BGP |Table |Non-stop\\)
+#     bgp_community: show bgp vpnv6 unicast vrf {vrf} community {target} | utility egrep -v \\(BGP |Table |Non-stop\\)
+#     bgp_route: show bgp vpnv6 unicast vrf {vrf} {target} | util egrep \\(BGP routing table entry|Path \\#|aggregated by|Origin |Community:|validity| from \\)
+#     ping: ping vrf {vrf} {target} count 5 source {source}
+#     traceroute: traceroute vrf {vrf} {target} timeout 1 probe 2 source {source}
 # huawei:
 #   ipv4_default:
 #     bgp_aspath: display bgp routing-table regular-expression {target}
@@ -45,9 +81,9 @@
 #     bgp_route: display bgp routing-table {target}
 #     ping: ping -c 5 -a {source} {target}
 #     traceroute: tracert -q 2 -f 1 -a {source} {target}
-#   ipv4_vrf:
+#   ipv4_vpn:
 #     bgp_aspath: display bgp vpnv4 vpn-instance {vrf} routing-table regular-expression {target}
-#     bgp_community: display bgp vpnv4 vpn-instance {vrf} routing-table regular-expression{target}
+#     bgp_community: display bgp vpnv4 vpn-instance {vrf} routing-table regular-expression {target}
 #     bgp_route: display bgp vpnv4 vpn-instance {vrf} routing-table {target}
 #     ping: ping -vpn-instance {vrf} -c 5 -a {source} {target}
 #     traceroute: tracert -q 2 -f 1 -vpn-instance {vrf} -a {source} {target}
@@ -57,22 +93,34 @@
 #     bgp_route: display bgp ipv6 routing-table {target}
 #     ping: ping ipv6 -c 5 -a {source} {target}
 #     traceroute: tracert ipv6 -q 2 -f 1 -a {source} {target}
-#   ipv6_vrf:
+#   ipv6_vpn:
 #     bgp_aspath: display bgp vpnv6 vpn-instance {vrf} routing-table regular-expression {target}
 #     bgp_community: display bgp vpnv6 vpn-instance {vrf} routing-table regular-expression {target}
 #     bgp_route: display bgp vpnv6 vpn-instance {vrf} routing-table {target}
 #     ping: ping vpnv6 vpn-instance {vrf} -c 5 -a {source} {target}
 #     traceroute: tracert -q 2 -f 1 vpn-instance {vrf} -a {source} {target}
-
 # juniper:
-#   dual:
-#     bgp_aspath: show route protocol bgp aspath-regex {target}
-#     bgp_community: show route protocol bgp community {target}
-#   ipv4:
+#   ipv4_default:
+#     bgp_aspath: show route protocol bgp table inet.0 aspath-regex {target}
+#     bgp_community: show route protocol bgp table inet.0 community {target}
 #     bgp_route: show route protocol bgp table inet.0 {target} detail
-#     ping: ping inet {target} count 5 source {src_addr_ipv4}
+#     ping: ping inet {target} count 5 source {source}
 #     traceroute: traceroute inet {target} wait 1 source {source}
-#   ipv6:
+#   ipv4_vpn:
+#     bgp_aspath: show route protocol bgp table {vrf} aspath-regex {target}
+#     bgp_community: show route protocol bgp table {vrf} community {target}
+#     bgp_route: show route protocol bgp table {vrf} {target} detail
+#     ping: ping inet routing-instance {vrf} {target} count 5 source {source}
+#     traceroute: traceroute inet routing-instance {vrf} {target} wait 1 source {source}
+#   ipv6_default:
+#     bgp_aspath: show route protocol bgp community {target}
+#     bgp_community: show route protocol bgp aspath-regex {target}
 #     bgp_route: show route protocol bgp table inet6.0 {target} detail
-#     ping: ping inet6 {target} count 5 source {src_addr_ipv6}
-#     traceroute: traceroute inet6 {target} wait 1 source {source}
\ No newline at end of file
+#     ping: ping inet6 {target} count 5 source {source}
+#     traceroute: traceroute inet6 {target} wait 1 source {source}
+#   ipv6_vpn:
+#     bgp_aspath: show route protocol bgp table {vrf} aspath-regex {target}
+#     bgp_community: show route protocol bgp table {vrf} community {target}
+#     bgp_route: show route protocol bgp table {vrf} {target} detail
+#     ping: ping inet6 routing-instance {vrf} {target} count 5 source {source}
+#     traceroute: traceroute inet6 routing-instance {vrf} {target} wait 1 source {source}
\ No newline at end of file
diff --git a/hyperglass/configuration/hyperglass.yaml.example b/hyperglass/configuration/hyperglass.yaml.example
index 6662e69..7789e30 100644
--- a/hyperglass/configuration/hyperglass.yaml.example
+++ b/hyperglass/configuration/hyperglass.yaml.example
@@ -8,10 +8,12 @@
 #   redis_port: 6379
 #   request_timeout: 30
 #   requires_ipv6_cidr:
-#     - cisco_ios
-#     - cisco_nxos
+#   - cisco_ios
+#   - cisco_nxos
 
 # branding:
+#   colors:
+#     background: '#fbfffe'
 #     danger: '#a21024'
 #     dark: '#383541'
 #     light: '#fbfffe'
@@ -53,14 +55,13 @@
 #     ping: Ping
 #     query_location: Location
 #     query_target: Target
-#     query_type: Query
+#     query_type: Query Type
 #     subtitle: AS{primary_asn}
 #     terms: Terms
 #     title: hyperglass
 #     title_mode: logo_only
 #     traceroute: Traceroute
-#     vrf: VRF
-
+#     vrf: Routing Table
 # features:
 #   bgp_aspath:
 #     enable: true
@@ -118,9 +119,8 @@
 #   invalid_input: '{target} is not a valid {query_type} target.'
 #   max_prefix: Prefix length must be shorter than /{max_length}. {target} is too specific.
 #   no_input: '{field} must be specified.'
-#   no_location: A location must be selected.
 #   no_matching_vrfs: No VRFs Match
-#   no_query_type: A query type must be specified.
+#   no_output: No output.
 #   noresponse_error: No response.
 #   request_timeout: Request timed out.
 #   requires_ipv6_cidr: '{device_name} requires IPv6 BGP lookups to be in CIDR notation.'