diff --git a/pinxi b/pinxi
index 0a7e831..26642b7 100755
--- a/pinxi
+++ b/pinxi
@@ -4129,7 +4129,7 @@ sub set_program_values {
 	'hikari' => ['^hikari',0,'0','hikari',0,1,0,'',''], # unverified
 	'hopalong' => ['^hopalong',0,'0','Hopalong',0,1,0,'',''], # unverified
 	'hyprctl' => ['^Tag:',2,'version','Hyprland',0,1,0,'',''], # method to get hyprland version
-	'hyprland' => ['^hyprland',0,'0','Hyprland',0,1,0,'',''], # unverified
+	'hyprland' => ['^hyprland',0,'0','Hyprland',0,1,0,'',''], # uses hyprctl for version
 	'i3' => ['^i3',3,'--version','i3',0,1,0,'',''],
 	'icewm' => ['^icewm',2,'--version','IceWM',0,1,0,'',''],
 	'inaban' => ['^inaban',0,'0','inaban',0,1,0,'',''], # unverified
@@ -4220,7 +4220,8 @@ sub set_program_values {
 	# out of stump, 2 --version, but in tries to start new wm instance endless hang
 	'stumpwm' => ['^SBCL',0,'--version','StumpWM',0,1,0,'',''], # hangs when run in wm
 	'surfaceflinger' => ['surfaceflinger^',0,'0','SurfaceFlinger',0,1,0,'',''], # Android, unverified
-	'sway' => ['^sway',3,'-v','sway',0,1,0,'',''],
+	'sway' => ['^sway',3,'-v','Sway',0,1,0,'',''],
+	'swayfx' => ['^sway',3,'-v','SwayFX',0,1,0,'',''], # not sure if safe
 	'swc' => ['^swc',0,'0','swc',0,1,0,'',''], # unverified
 	'swvkc' => ['^swvkc',0,'0','swvkc',0,1,0,'',''], # unverified
 	'tabby' => ['^tabby',0,'0','Tabby',0,1,0,'',''], # unverified
@@ -4257,7 +4258,7 @@ sub set_program_values {
 	'wio' => ['^wio',0,'0','Wio',0,1,0,'',''], # unverified
 	'wio' => ['^wio\+',0,'0','wio+',0,1,0,'',''], # unverified
 	'wm2' => ['^wm2',0,'0','wm2',0,1,0,'',''], # no version
-	'wmaker' => ['^Window[[:space:]]*Maker',-1,'--version','WindowMaker',0,1,0,'',''],
+	'wmaker' => ['^Window\s*Maker',-1,'--version','WindowMaker',0,1,0,'',''],
 	'wmfs' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
 	'wmfs2' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
 	'wmii' => ['^wmii',1,'-v','wmii',0,1,0,'^wmii[234]?-',''], # wmii is wmii3
@@ -4360,8 +4361,8 @@ sub set_program_values {
 # note: setting index 1 or 2 to 0 will trip flags to not do version
 # args: 0: program lower case name
 sub program_values {
-	my ($app) = @_;
-	my (@program_data);
+	my $app = $_[0];
+	my @program_data;
 	set_program_values() if !%program_values;
 	if (defined $program_values{$app}){
 		@program_data = @{$program_values{$app}};
@@ -29652,8 +29653,8 @@ sub set_info_data {
 	eval $start if $b_log;
 	main::set_ps_gui() if !$loaded{'ps-gui'};
 	my (@data,@info,$item);
-	my $pattern = 'alltray|awn|bar|bmpanel|bmpanel2|budgie-panel|cairo-dock|';
-	$pattern .= 'dde-dock|dmenu|dockbarx|docker|docky|dzen|dzen2|';
+	my $pattern = 'alltray|awn|awesomebar|bar|bmpanel|bmpanel2|budgie-panel|';
+	$pattern .= 'cairo-dock|dde-dock|dmenu|dockbarx|docker|docky|dzen|dzen2|';
 	$pattern .= 'fancybar|fbpanel|fspanel|glx-dock|gnome-panel|hpanel|';
 	$pattern .= 'i3bar|i3status|i3-status-rs|icewmtray|';
 	$pattern .= 'kdocker|kicker|';
@@ -31327,8 +31328,10 @@ sub system_base {
 	# osr base, distro id in issue
 	my $base_osr_issue = 'grml|linux lite|openmediavault'; 
 	# same as rhel re VERSION_ID but likely only ID_LIKE=fedora
-	my $base_osr_fedora = 'ultramarine';
+	my $base_osr_fedora = 'amahi|asahi|audinux|clearos|fx64|montana|nobara|qubes|';
+	$base_osr_fedora .= 'risios|ultramarine|vortexbox';
 	# osr has distro name but has fedora centos redhat ID_LIKE and VERSION_ID same
+	# fedora not handled will fall to RHEL if contains centos string
 	my $base_osr_redhat = 'almalinux|centos|eurolinux|oracle|puias|rocky|';
 	$base_osr_redhat .= 'scientific|springdale'; 
 	# osr has distro name but has ubuntu (or debian) ID_LIKE/UBUNTU_CODENAME
@@ -34475,7 +34478,7 @@ sub set_ps_gui {
 	}
 	# info: NOTE: glx-dock is cairo-dock
 	if ($show{'system'} && $extra > 2){
-		@temp=qw(alltray awn bar bmpanel bmpanel2 budgie-panel 
+		@temp=qw(alltray awesomebar awn bar bmpanel bmpanel2 budgie-panel 
 		cairo-dock dde-dock dmenu dockbarx docker docky dzen dzen2
 		fbpanel fspanel glx-dock gnome-panel hpanel i3bar i3-status(-rs)? icewmtray 
 		kdocker kicker latte latte-dock lemonbar ltpanel luastatus lxpanel lxqt-panel