421 files changed, 48 insertions, 11 deletions

diff --git a/hardinfo2/.gitignore b/.gitignore
index 000e8741..000e8741 100644
--- a/hardinfo2/.gitignore
+++ b/.gitignore
diff --git a/hardinfo2/CMakeLists.txt b/CMakeLists.txt
index 24641294..7843d63a 100644
--- a/hardinfo2/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,12 @@
 project(HardInfo)
 cmake_minimum_required(VERSION 2.6)
 
+set(HARDINFO_VERSION "0.5.2pre")
+
+if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+	set(HARDINFO_DEBUG 1)
+endif()
+
 if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
 	set(HARDINFO_OS "linux")
 else()
@@ -43,6 +49,7 @@ include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/includes
 	${CMAKE_SOURCE_DIR}/includes/${HARDINFO_ARCH}
+	${CMAKE_BINARY_DIR}
 	${GTK_INCLUDE_DIRS}
 	${LIBSOUP_INCLUDE_DIRS}
 )
@@ -116,18 +123,18 @@ foreach (_module ${HARDINFO_MODULES})
 	add_library(${_module} MODULE ${MODULE_${_module}_SOURCES})
 endforeach()
 
-add_library(hardinfo-remote SHARED
+add_library(hardinfo-remote STATIC
         remote/remote.c
         remote/ssh-conn.c
         remote/xmlrpc-client.c
         remote/xmlrpc-server.c
 )
-add_library(hardinfo-help-viewer SHARED
+add_library(hardinfo-help-viewer STATIC
         help-viewer/egg-markdown.c
         help-viewer/help-viewer.c
         help-viewer/markdown-text-view.c
 )
-add_library(hardinfo-shell SHARED
+add_library(hardinfo-shell STATIC
         shell/callbacks.c
         shell/iconcache.c
         shell/loadgraph.c
@@ -137,36 +144,31 @@ add_library(hardinfo-shell SHARED
         shell/stock.c
 	shell/syncmanager.c
 )
-add_library(hardinfo-util SHARED
+add_executable(hardinfo
 	util/binreloc.c
 	util/expr.c
 	util/socket.c
 	util/vendor.c
 	util/util.c
-)
-add_executable(hardinfo
         hardinfo/hardinfo.c
 )
 target_link_libraries(hardinfo 
 	${GTK_LIBRARIES}
 	${LIBSOUP_LIBRARIES}
 	hardinfo-shell
-	hardinfo-util
 )
 target_link_libraries(hardinfo-shell
 	hardinfo-help-viewer
 	hardinfo-remote
 )
 
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h @ONLY)
+
 install(TARGETS hardinfo ${HARDINFO_MODULES}
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION lib/hardinfo/modules
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
-install(TARGETS hardinfo-shell hardinfo-util hardinfo-help-viewer hardinfo-remote
-	LIBRARY DESTINATION lib
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-)
 install(FILES ${HARDINFO_RESOURCES}
 	DESTINATION share/hardinfo
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
diff --git a/hardinfo2/LICENSE b/LICENSE
index 21b9363e..21b9363e 100644
--- a/hardinfo2/LICENSE
+++ b/LICENSE
diff --git a/hardinfo2/TODO b/TODO
index 513752d4..513752d4 100644
--- a/hardinfo2/TODO
+++ b/TODO
diff --git a/hardinfo2/arch/common/blowfish.h b/arch/common/blowfish.h
index 333fb157..333fb157 100644
--- a/hardinfo2/arch/common/blowfish.h
+++ b/arch/common/blowfish.h
diff --git a/hardinfo2/arch/common/cryptohash.h b/arch/common/cryptohash.h
index 2c917c9b..2c917c9b 100644
--- a/hardinfo2/arch/common/cryptohash.h
+++ b/arch/common/cryptohash.h
diff --git a/hardinfo2/arch/common/display.h b/arch/common/display.h
index 075a0a24..075a0a24 100644
--- a/hardinfo2/arch/common/display.h
+++ b/arch/common/display.h
diff --git a/hardinfo2/arch/common/drawing.h b/arch/common/drawing.h
index 4ebfb3b5..4ebfb3b5 100644
--- a/hardinfo2/arch/common/drawing.h
+++ b/arch/common/drawing.h
diff --git a/hardinfo2/arch/common/environment.h b/arch/common/environment.h
index 669be6d1..669be6d1 100644
--- a/hardinfo2/arch/common/environment.h
+++ b/arch/common/environment.h
diff --git a/hardinfo2/arch/common/fft.h b/arch/common/fft.h
index f1a0ced8..f1a0ced8 100644
--- a/hardinfo2/arch/common/fft.h
+++ b/arch/common/fft.h
diff --git a/hardinfo2/arch/common/fib.h b/arch/common/fib.h
index 6a216afe..6a216afe 100644
--- a/hardinfo2/arch/common/fib.h
+++ b/arch/common/fib.h
diff --git a/hardinfo2/arch/common/languages.h b/arch/common/languages.h
index 39e557fc..39e557fc 100644
--- a/hardinfo2/arch/common/languages.h
+++ b/arch/common/languages.h
diff --git a/hardinfo2/arch/common/nqueens.h b/arch/common/nqueens.h
index 6ad5b4fd..6ad5b4fd 100644
--- a/hardinfo2/arch/common/nqueens.h
+++ b/arch/common/nqueens.h
diff --git a/hardinfo2/arch/common/printers.h b/arch/common/printers.h
index 0e865c04..0e865c04 100644
--- a/hardinfo2/arch/common/printers.h
+++ b/arch/common/printers.h
diff --git a/hardinfo2/arch/common/raytrace.h b/arch/common/raytrace.h
index fe2fda91..fe2fda91 100644
--- a/hardinfo2/arch/common/raytrace.h
+++ b/arch/common/raytrace.h
diff --git a/hardinfo2/arch/common/users.h b/arch/common/users.h
index 8d087fa5..8d087fa5 100644
--- a/hardinfo2/arch/common/users.h
+++ b/arch/common/users.h
diff --git a/hardinfo2/arch/linux/alpha/alsa.h b/arch/linux/alpha/alsa.h
index ede8a364..ede8a364 120000
--- a/hardinfo2/arch/linux/alpha/alsa.h
+++ b/arch/linux/alpha/alsa.h
diff --git a/hardinfo2/arch/linux/alpha/battery.h b/arch/linux/alpha/battery.h
index ed7360e1..ed7360e1 120000
--- a/hardinfo2/arch/linux/alpha/battery.h
+++ b/arch/linux/alpha/battery.h
diff --git a/hardinfo2/arch/linux/alpha/boots.h b/arch/linux/alpha/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/alpha/boots.h
+++ b/arch/linux/alpha/boots.h
diff --git a/hardinfo2/arch/linux/alpha/devmemory.h b/arch/linux/alpha/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/alpha/devmemory.h
+++ b/arch/linux/alpha/devmemory.h
diff --git a/hardinfo2/arch/linux/alpha/filesystem.h b/arch/linux/alpha/filesystem.h
index d884bcd0..d884bcd0 120000
--- a/hardinfo2/arch/linux/alpha/filesystem.h
+++ b/arch/linux/alpha/filesystem.h
diff --git a/hardinfo2/arch/linux/alpha/inputdevices.h b/arch/linux/alpha/inputdevices.h
index 0f594231..0f594231 120000
--- a/hardinfo2/arch/linux/alpha/inputdevices.h
+++ b/arch/linux/alpha/inputdevices.h
diff --git a/hardinfo2/arch/linux/alpha/loadavg.h b/arch/linux/alpha/loadavg.h
index 1f64e107..1f64e107 120000
--- a/hardinfo2/arch/linux/alpha/loadavg.h
+++ b/arch/linux/alpha/loadavg.h
diff --git a/hardinfo2/arch/linux/alpha/memory.h b/arch/linux/alpha/memory.h
index 64c6e0ed..64c6e0ed 120000
--- a/hardinfo2/arch/linux/alpha/memory.h
+++ b/arch/linux/alpha/memory.h
diff --git a/hardinfo2/arch/linux/alpha/modules.h b/arch/linux/alpha/modules.h
index d21c9a20..d21c9a20 120000
--- a/hardinfo2/arch/linux/alpha/modules.h
+++ b/arch/linux/alpha/modules.h
diff --git a/hardinfo2/arch/linux/alpha/net.h b/arch/linux/alpha/net.h
index 488b5ae3..488b5ae3 120000
--- a/hardinfo2/arch/linux/alpha/net.h
+++ b/arch/linux/alpha/net.h
diff --git a/hardinfo2/arch/linux/alpha/nfs.h b/arch/linux/alpha/nfs.h
index 73e0b8c9..73e0b8c9 120000
--- a/hardinfo2/arch/linux/alpha/nfs.h
+++ b/arch/linux/alpha/nfs.h
diff --git a/hardinfo2/arch/linux/alpha/os.h b/arch/linux/alpha/os.h
index 44051626..44051626 120000
--- a/hardinfo2/arch/linux/alpha/os.h
+++ b/arch/linux/alpha/os.h
diff --git a/hardinfo2/arch/linux/alpha/pci.h b/arch/linux/alpha/pci.h
index 8df04a0e..8df04a0e 120000
--- a/hardinfo2/arch/linux/alpha/pci.h
+++ b/arch/linux/alpha/pci.h
diff --git a/hardinfo2/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h
index 1e5b014c..1e5b014c 100644
--- a/hardinfo2/arch/linux/alpha/processor.h
+++ b/arch/linux/alpha/processor.h
diff --git a/hardinfo2/arch/linux/alpha/resources.h b/arch/linux/alpha/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/alpha/resources.h
+++ b/arch/linux/alpha/resources.h
diff --git a/hardinfo2/arch/linux/alpha/samba.h b/arch/linux/alpha/samba.h
index ebab9b11..ebab9b11 120000
--- a/hardinfo2/arch/linux/alpha/samba.h
+++ b/arch/linux/alpha/samba.h
diff --git a/hardinfo2/arch/linux/alpha/sensors.h b/arch/linux/alpha/sensors.h
index 3b799377..3b799377 120000
--- a/hardinfo2/arch/linux/alpha/sensors.h
+++ b/arch/linux/alpha/sensors.h
diff --git a/hardinfo2/arch/linux/alpha/storage.h b/arch/linux/alpha/storage.h
index 3ea886ce..3ea886ce 120000
--- a/hardinfo2/arch/linux/alpha/storage.h
+++ b/arch/linux/alpha/storage.h
diff --git a/hardinfo2/arch/linux/alpha/uptime.h b/arch/linux/alpha/uptime.h
index a5bac980..a5bac980 120000
--- a/hardinfo2/arch/linux/alpha/uptime.h
+++ b/arch/linux/alpha/uptime.h
diff --git a/hardinfo2/arch/linux/alpha/usb.h b/arch/linux/alpha/usb.h
index aee3046c..aee3046c 120000
--- a/hardinfo2/arch/linux/alpha/usb.h
+++ b/arch/linux/alpha/usb.h
diff --git a/hardinfo2/arch/linux/armv4l/alsa.h b/arch/linux/armv4l/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/armv4l/alsa.h
+++ b/arch/linux/armv4l/alsa.h
diff --git a/hardinfo2/arch/linux/armv4l/battery.h b/arch/linux/armv4l/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/armv4l/battery.h
+++ b/arch/linux/armv4l/battery.h
diff --git a/hardinfo2/arch/linux/armv4l/boots.h b/arch/linux/armv4l/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/armv4l/boots.h
+++ b/arch/linux/armv4l/boots.h
diff --git a/hardinfo2/arch/linux/armv4l/devmemory.h b/arch/linux/armv4l/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/armv4l/devmemory.h
+++ b/arch/linux/armv4l/devmemory.h
diff --git a/hardinfo2/arch/linux/armv4l/filesystem.h b/arch/linux/armv4l/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/armv4l/filesystem.h
+++ b/arch/linux/armv4l/filesystem.h
diff --git a/hardinfo2/arch/linux/armv4l/inputdevices.h b/arch/linux/armv4l/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/armv4l/inputdevices.h
+++ b/arch/linux/armv4l/inputdevices.h
diff --git a/hardinfo2/arch/linux/armv4l/loadavg.h b/arch/linux/armv4l/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/armv4l/loadavg.h
+++ b/arch/linux/armv4l/loadavg.h
diff --git a/hardinfo2/arch/linux/armv4l/memory.h b/arch/linux/armv4l/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/armv4l/memory.h
+++ b/arch/linux/armv4l/memory.h
diff --git a/hardinfo2/arch/linux/armv4l/modules.h b/arch/linux/armv4l/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/armv4l/modules.h
+++ b/arch/linux/armv4l/modules.h
diff --git a/hardinfo2/arch/linux/armv4l/net.h b/arch/linux/armv4l/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/armv4l/net.h
+++ b/arch/linux/armv4l/net.h
diff --git a/hardinfo2/arch/linux/armv4l/nfs.h b/arch/linux/armv4l/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/armv4l/nfs.h
+++ b/arch/linux/armv4l/nfs.h
diff --git a/hardinfo2/arch/linux/armv4l/os.h b/arch/linux/armv4l/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/armv4l/os.h
+++ b/arch/linux/armv4l/os.h
diff --git a/hardinfo2/arch/linux/armv4l/pci.h b/arch/linux/armv4l/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/armv4l/pci.h
+++ b/arch/linux/armv4l/pci.h
diff --git a/hardinfo2/arch/linux/armv4l/processor.h b/arch/linux/armv4l/processor.h
index 82b6be04..82b6be04 100644
--- a/hardinfo2/arch/linux/armv4l/processor.h
+++ b/arch/linux/armv4l/processor.h
diff --git a/hardinfo2/arch/linux/armv4l/resources.h b/arch/linux/armv4l/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/armv4l/resources.h
+++ b/arch/linux/armv4l/resources.h
diff --git a/hardinfo2/arch/linux/armv4l/samba.h b/arch/linux/armv4l/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/armv4l/samba.h
+++ b/arch/linux/armv4l/samba.h
diff --git a/hardinfo2/arch/linux/armv4l/sensors.h b/arch/linux/armv4l/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/armv4l/sensors.h
+++ b/arch/linux/armv4l/sensors.h
diff --git a/hardinfo2/arch/linux/armv4l/storage.h b/arch/linux/armv4l/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/armv4l/storage.h
+++ b/arch/linux/armv4l/storage.h
diff --git a/hardinfo2/arch/linux/armv4l/uptime.h b/arch/linux/armv4l/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/armv4l/uptime.h
+++ b/arch/linux/armv4l/uptime.h
diff --git a/hardinfo2/arch/linux/armv4l/usb.h b/arch/linux/armv4l/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/armv4l/usb.h
+++ b/arch/linux/armv4l/usb.h
diff --git a/hardinfo2/arch/linux/common/alsa.h b/arch/linux/common/alsa.h
index 1a156c2e..1a156c2e 100644
--- a/hardinfo2/arch/linux/common/alsa.h
+++ b/arch/linux/common/alsa.h
diff --git a/hardinfo2/arch/linux/common/battery.h b/arch/linux/common/battery.h
index 5161422a..5161422a 100644
--- a/hardinfo2/arch/linux/common/battery.h
+++ b/arch/linux/common/battery.h
diff --git a/hardinfo2/arch/linux/common/boots.h b/arch/linux/common/boots.h
index 8a3c11fa..8a3c11fa 100644
--- a/hardinfo2/arch/linux/common/boots.h
+++ b/arch/linux/common/boots.h
diff --git a/hardinfo2/arch/linux/common/devmemory.h b/arch/linux/common/devmemory.h
index e3921cdd..e3921cdd 100644
--- a/hardinfo2/arch/linux/common/devmemory.h
+++ b/arch/linux/common/devmemory.h
diff --git a/hardinfo2/arch/linux/common/dmi.h b/arch/linux/common/dmi.h
index 6d35b25a..6d35b25a 100644
--- a/hardinfo2/arch/linux/common/dmi.h
+++ b/arch/linux/common/dmi.h
diff --git a/hardinfo2/arch/linux/common/filesystem.h b/arch/linux/common/filesystem.h
index 48cbbd51..48cbbd51 100644
--- a/hardinfo2/arch/linux/common/filesystem.h
+++ b/arch/linux/common/filesystem.h
diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/arch/linux/common/inputdevices.h
index 20e4289c..20e4289c 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/arch/linux/common/inputdevices.h
diff --git a/hardinfo2/arch/linux/common/loadavg.h b/arch/linux/common/loadavg.h
index ce2d8775..ce2d8775 100644
--- a/hardinfo2/arch/linux/common/loadavg.h
+++ b/arch/linux/common/loadavg.h
diff --git a/hardinfo2/arch/linux/common/memory.h b/arch/linux/common/memory.h
index c87359b9..c87359b9 100644
--- a/hardinfo2/arch/linux/common/memory.h
+++ b/arch/linux/common/memory.h
diff --git a/hardinfo2/arch/linux/common/modules.h b/arch/linux/common/modules.h
index 78fb9de3..78fb9de3 100644
--- a/hardinfo2/arch/linux/common/modules.h
+++ b/arch/linux/common/modules.h
diff --git a/hardinfo2/arch/linux/common/net.h b/arch/linux/common/net.h
index c3224321..c3224321 100644
--- a/hardinfo2/arch/linux/common/net.h
+++ b/arch/linux/common/net.h
diff --git a/hardinfo2/arch/linux/common/nfs.h b/arch/linux/common/nfs.h
index 894680db..894680db 100644
--- a/hardinfo2/arch/linux/common/nfs.h
+++ b/arch/linux/common/nfs.h
diff --git a/hardinfo2/arch/linux/common/os.h b/arch/linux/common/os.h
index 93d10f13..93d10f13 100644
--- a/hardinfo2/arch/linux/common/os.h
+++ b/arch/linux/common/os.h
diff --git a/hardinfo2/arch/linux/common/pci.h b/arch/linux/common/pci.h
index f77215b0..f77215b0 100644
--- a/hardinfo2/arch/linux/common/pci.h
+++ b/arch/linux/common/pci.h
diff --git a/hardinfo2/arch/linux/common/resources.h b/arch/linux/common/resources.h
index e266e375..e266e375 100644
--- a/hardinfo2/arch/linux/common/resources.h
+++ b/arch/linux/common/resources.h
diff --git a/hardinfo2/arch/linux/common/samba.h b/arch/linux/common/samba.h
index 7d835612..7d835612 100644
--- a/hardinfo2/arch/linux/common/samba.h
+++ b/arch/linux/common/samba.h
diff --git a/hardinfo2/arch/linux/common/sensors.h b/arch/linux/common/sensors.h
index abbe90b4..abbe90b4 100644
--- a/hardinfo2/arch/linux/common/sensors.h
+++ b/arch/linux/common/sensors.h
diff --git a/hardinfo2/arch/linux/common/storage.h b/arch/linux/common/storage.h
index ebf9eba1..ebf9eba1 100644
--- a/hardinfo2/arch/linux/common/storage.h
+++ b/arch/linux/common/storage.h
diff --git a/hardinfo2/arch/linux/common/uptime.h b/arch/linux/common/uptime.h
index 8fdc3a27..8fdc3a27 100644
--- a/hardinfo2/arch/linux/common/uptime.h
+++ b/arch/linux/common/uptime.h
diff --git a/hardinfo2/arch/linux/common/usb.h b/arch/linux/common/usb.h
index 7c135d7c..7c135d7c 100644
--- a/hardinfo2/arch/linux/common/usb.h
+++ b/arch/linux/common/usb.h
diff --git a/hardinfo2/arch/linux/ia64/alsa.h b/arch/linux/ia64/alsa.h
index ede8a364..ede8a364 120000
--- a/hardinfo2/arch/linux/ia64/alsa.h
+++ b/arch/linux/ia64/alsa.h
diff --git a/hardinfo2/arch/linux/ia64/battery.h b/arch/linux/ia64/battery.h
index ed7360e1..ed7360e1 120000
--- a/hardinfo2/arch/linux/ia64/battery.h
+++ b/arch/linux/ia64/battery.h
diff --git a/hardinfo2/arch/linux/ia64/boots.h b/arch/linux/ia64/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/ia64/boots.h
+++ b/arch/linux/ia64/boots.h
diff --git a/hardinfo2/arch/linux/ia64/devmemory.h b/arch/linux/ia64/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/ia64/devmemory.h
+++ b/arch/linux/ia64/devmemory.h
diff --git a/hardinfo2/arch/linux/ia64/filesystem.h b/arch/linux/ia64/filesystem.h
index d884bcd0..d884bcd0 120000
--- a/hardinfo2/arch/linux/ia64/filesystem.h
+++ b/arch/linux/ia64/filesystem.h
diff --git a/hardinfo2/arch/linux/ia64/inputdevices.h b/arch/linux/ia64/inputdevices.h
index 0f594231..0f594231 120000
--- a/hardinfo2/arch/linux/ia64/inputdevices.h
+++ b/arch/linux/ia64/inputdevices.h
diff --git a/hardinfo2/arch/linux/ia64/loadavg.h b/arch/linux/ia64/loadavg.h
index 1f64e107..1f64e107 120000
--- a/hardinfo2/arch/linux/ia64/loadavg.h
+++ b/arch/linux/ia64/loadavg.h
diff --git a/hardinfo2/arch/linux/ia64/memory.h b/arch/linux/ia64/memory.h
index 64c6e0ed..64c6e0ed 120000
--- a/hardinfo2/arch/linux/ia64/memory.h
+++ b/arch/linux/ia64/memory.h
diff --git a/hardinfo2/arch/linux/ia64/modules.h b/arch/linux/ia64/modules.h
index d21c9a20..d21c9a20 120000
--- a/hardinfo2/arch/linux/ia64/modules.h
+++ b/arch/linux/ia64/modules.h
diff --git a/hardinfo2/arch/linux/ia64/net.h b/arch/linux/ia64/net.h
index 488b5ae3..488b5ae3 120000
--- a/hardinfo2/arch/linux/ia64/net.h
+++ b/arch/linux/ia64/net.h
diff --git a/hardinfo2/arch/linux/ia64/nfs.h b/arch/linux/ia64/nfs.h
index 73e0b8c9..73e0b8c9 120000
--- a/hardinfo2/arch/linux/ia64/nfs.h
+++ b/arch/linux/ia64/nfs.h
diff --git a/hardinfo2/arch/linux/ia64/os.h b/arch/linux/ia64/os.h
index 44051626..44051626 120000
--- a/hardinfo2/arch/linux/ia64/os.h
+++ b/arch/linux/ia64/os.h
diff --git a/hardinfo2/arch/linux/ia64/pci.h b/arch/linux/ia64/pci.h
index 8df04a0e..8df04a0e 120000
--- a/hardinfo2/arch/linux/ia64/pci.h
+++ b/arch/linux/ia64/pci.h
diff --git a/hardinfo2/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h
index d3d41519..d3d41519 100644
--- a/hardinfo2/arch/linux/ia64/processor.h
+++ b/arch/linux/ia64/processor.h
diff --git a/hardinfo2/arch/linux/ia64/resources.h b/arch/linux/ia64/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/ia64/resources.h
+++ b/arch/linux/ia64/resources.h
diff --git a/hardinfo2/arch/linux/ia64/samba.h b/arch/linux/ia64/samba.h
index ebab9b11..ebab9b11 120000
--- a/hardinfo2/arch/linux/ia64/samba.h
+++ b/arch/linux/ia64/samba.h
diff --git a/hardinfo2/arch/linux/ia64/sensors.h b/arch/linux/ia64/sensors.h
index 3b799377..3b799377 120000
--- a/hardinfo2/arch/linux/ia64/sensors.h
+++ b/arch/linux/ia64/sensors.h
diff --git a/hardinfo2/arch/linux/ia64/storage.h b/arch/linux/ia64/storage.h
index 3ea886ce..3ea886ce 120000
--- a/hardinfo2/arch/linux/ia64/storage.h
+++ b/arch/linux/ia64/storage.h
diff --git a/hardinfo2/arch/linux/ia64/uptime.h b/arch/linux/ia64/uptime.h
index a5bac980..a5bac980 120000
--- a/hardinfo2/arch/linux/ia64/uptime.h
+++ b/arch/linux/ia64/uptime.h
diff --git a/hardinfo2/arch/linux/ia64/usb.h b/arch/linux/ia64/usb.h
index aee3046c..aee3046c 120000
--- a/hardinfo2/arch/linux/ia64/usb.h
+++ b/arch/linux/ia64/usb.h
diff --git a/hardinfo2/arch/linux/m68k/alsa.h b/arch/linux/m68k/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/m68k/alsa.h
+++ b/arch/linux/m68k/alsa.h
diff --git a/hardinfo2/arch/linux/m68k/battery.h b/arch/linux/m68k/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/m68k/battery.h
+++ b/arch/linux/m68k/battery.h
diff --git a/hardinfo2/arch/linux/m68k/boots.h b/arch/linux/m68k/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/m68k/boots.h
+++ b/arch/linux/m68k/boots.h
diff --git a/hardinfo2/arch/linux/m68k/devmemory.h b/arch/linux/m68k/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/m68k/devmemory.h
+++ b/arch/linux/m68k/devmemory.h
diff --git a/hardinfo2/arch/linux/m68k/filesystem.h b/arch/linux/m68k/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/m68k/filesystem.h
+++ b/arch/linux/m68k/filesystem.h
diff --git a/hardinfo2/arch/linux/m68k/inputdevices.h b/arch/linux/m68k/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/m68k/inputdevices.h
+++ b/arch/linux/m68k/inputdevices.h
diff --git a/hardinfo2/arch/linux/m68k/loadavg.h b/arch/linux/m68k/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/m68k/loadavg.h
+++ b/arch/linux/m68k/loadavg.h
diff --git a/hardinfo2/arch/linux/m68k/memory.h b/arch/linux/m68k/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/m68k/memory.h
+++ b/arch/linux/m68k/memory.h
diff --git a/hardinfo2/arch/linux/m68k/modules.h b/arch/linux/m68k/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/m68k/modules.h
+++ b/arch/linux/m68k/modules.h
diff --git a/hardinfo2/arch/linux/m68k/net.h b/arch/linux/m68k/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/m68k/net.h
+++ b/arch/linux/m68k/net.h
diff --git a/hardinfo2/arch/linux/m68k/nfs.h b/arch/linux/m68k/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/m68k/nfs.h
+++ b/arch/linux/m68k/nfs.h
diff --git a/hardinfo2/arch/linux/m68k/os.h b/arch/linux/m68k/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/m68k/os.h
+++ b/arch/linux/m68k/os.h
diff --git a/hardinfo2/arch/linux/m68k/pci.h b/arch/linux/m68k/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/m68k/pci.h
+++ b/arch/linux/m68k/pci.h
diff --git a/hardinfo2/arch/linux/m68k/processor.h b/arch/linux/m68k/processor.h
index 6fbd8293..6fbd8293 100644
--- a/hardinfo2/arch/linux/m68k/processor.h
+++ b/arch/linux/m68k/processor.h
diff --git a/hardinfo2/arch/linux/m68k/resources.h b/arch/linux/m68k/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/m68k/resources.h
+++ b/arch/linux/m68k/resources.h
diff --git a/hardinfo2/arch/linux/m68k/samba.h b/arch/linux/m68k/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/m68k/samba.h
+++ b/arch/linux/m68k/samba.h
diff --git a/hardinfo2/arch/linux/m68k/sensors.h b/arch/linux/m68k/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/m68k/sensors.h
+++ b/arch/linux/m68k/sensors.h
diff --git a/hardinfo2/arch/linux/m68k/storage.h b/arch/linux/m68k/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/m68k/storage.h
+++ b/arch/linux/m68k/storage.h
diff --git a/hardinfo2/arch/linux/m68k/uptime.h b/arch/linux/m68k/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/m68k/uptime.h
+++ b/arch/linux/m68k/uptime.h
diff --git a/hardinfo2/arch/linux/m68k/usb.h b/arch/linux/m68k/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/m68k/usb.h
+++ b/arch/linux/m68k/usb.h
diff --git a/hardinfo2/arch/linux/mips/alsa.h b/arch/linux/mips/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/mips/alsa.h
+++ b/arch/linux/mips/alsa.h
diff --git a/hardinfo2/arch/linux/mips/battery.h b/arch/linux/mips/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/mips/battery.h
+++ b/arch/linux/mips/battery.h
diff --git a/hardinfo2/arch/linux/mips/boots.h b/arch/linux/mips/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/mips/boots.h
+++ b/arch/linux/mips/boots.h
diff --git a/hardinfo2/arch/linux/mips/devmemory.h b/arch/linux/mips/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/mips/devmemory.h
+++ b/arch/linux/mips/devmemory.h
diff --git a/hardinfo2/arch/linux/mips/filesystem.h b/arch/linux/mips/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/mips/filesystem.h
+++ b/arch/linux/mips/filesystem.h
diff --git a/hardinfo2/arch/linux/mips/inputdevices.h b/arch/linux/mips/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/mips/inputdevices.h
+++ b/arch/linux/mips/inputdevices.h
diff --git a/hardinfo2/arch/linux/mips/loadavg.h b/arch/linux/mips/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/mips/loadavg.h
+++ b/arch/linux/mips/loadavg.h
diff --git a/hardinfo2/arch/linux/mips/memory.h b/arch/linux/mips/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/mips/memory.h
+++ b/arch/linux/mips/memory.h
diff --git a/hardinfo2/arch/linux/mips/modules.h b/arch/linux/mips/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/mips/modules.h
+++ b/arch/linux/mips/modules.h
diff --git a/hardinfo2/arch/linux/mips/net.h b/arch/linux/mips/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/mips/net.h
+++ b/arch/linux/mips/net.h
diff --git a/hardinfo2/arch/linux/mips/nfs.h b/arch/linux/mips/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/mips/nfs.h
+++ b/arch/linux/mips/nfs.h
diff --git a/hardinfo2/arch/linux/mips/os.h b/arch/linux/mips/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/mips/os.h
+++ b/arch/linux/mips/os.h
diff --git a/hardinfo2/arch/linux/mips/pci.h b/arch/linux/mips/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/mips/pci.h
+++ b/arch/linux/mips/pci.h
diff --git a/hardinfo2/arch/linux/mips/processor.h b/arch/linux/mips/processor.h
index cd10bd7a..cd10bd7a 100644
--- a/hardinfo2/arch/linux/mips/processor.h
+++ b/arch/linux/mips/processor.h
diff --git a/hardinfo2/arch/linux/mips/resources.h b/arch/linux/mips/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/mips/resources.h
+++ b/arch/linux/mips/resources.h
diff --git a/hardinfo2/arch/linux/mips/samba.h b/arch/linux/mips/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/mips/samba.h
+++ b/arch/linux/mips/samba.h
diff --git a/hardinfo2/arch/linux/mips/sensors.h b/arch/linux/mips/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/mips/sensors.h
+++ b/arch/linux/mips/sensors.h
diff --git a/hardinfo2/arch/linux/mips/storage.h b/arch/linux/mips/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/mips/storage.h
+++ b/arch/linux/mips/storage.h
diff --git a/hardinfo2/arch/linux/mips/uptime.h b/arch/linux/mips/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/mips/uptime.h
+++ b/arch/linux/mips/uptime.h
diff --git a/hardinfo2/arch/linux/mips/usb.h b/arch/linux/mips/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/mips/usb.h
+++ b/arch/linux/mips/usb.h
diff --git a/hardinfo2/arch/linux/parisc/alsa.h b/arch/linux/parisc/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/parisc/alsa.h
+++ b/arch/linux/parisc/alsa.h
diff --git a/hardinfo2/arch/linux/parisc/battery.h b/arch/linux/parisc/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/parisc/battery.h
+++ b/arch/linux/parisc/battery.h
diff --git a/hardinfo2/arch/linux/parisc/boots.h b/arch/linux/parisc/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/parisc/boots.h
+++ b/arch/linux/parisc/boots.h
diff --git a/hardinfo2/arch/linux/parisc/devmemory.h b/arch/linux/parisc/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/parisc/devmemory.h
+++ b/arch/linux/parisc/devmemory.h
diff --git a/hardinfo2/arch/linux/parisc/filesystem.h b/arch/linux/parisc/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/parisc/filesystem.h
+++ b/arch/linux/parisc/filesystem.h
diff --git a/hardinfo2/arch/linux/parisc/inputdevices.h b/arch/linux/parisc/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/parisc/inputdevices.h
+++ b/arch/linux/parisc/inputdevices.h
diff --git a/hardinfo2/arch/linux/parisc/loadavg.h b/arch/linux/parisc/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/parisc/loadavg.h
+++ b/arch/linux/parisc/loadavg.h
diff --git a/hardinfo2/arch/linux/parisc/memory.h b/arch/linux/parisc/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/parisc/memory.h
+++ b/arch/linux/parisc/memory.h
diff --git a/hardinfo2/arch/linux/parisc/modules.h b/arch/linux/parisc/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/parisc/modules.h
+++ b/arch/linux/parisc/modules.h
diff --git a/hardinfo2/arch/linux/parisc/net.h b/arch/linux/parisc/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/parisc/net.h
+++ b/arch/linux/parisc/net.h
diff --git a/hardinfo2/arch/linux/parisc/nfs.h b/arch/linux/parisc/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/parisc/nfs.h
+++ b/arch/linux/parisc/nfs.h
diff --git a/hardinfo2/arch/linux/parisc/os.h b/arch/linux/parisc/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/parisc/os.h
+++ b/arch/linux/parisc/os.h
diff --git a/hardinfo2/arch/linux/parisc/pci.h b/arch/linux/parisc/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/parisc/pci.h
+++ b/arch/linux/parisc/pci.h
diff --git a/hardinfo2/arch/linux/parisc/processor.h b/arch/linux/parisc/processor.h
index 1712e523..1712e523 100644
--- a/hardinfo2/arch/linux/parisc/processor.h
+++ b/arch/linux/parisc/processor.h
diff --git a/hardinfo2/arch/linux/parisc/resources.h b/arch/linux/parisc/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/parisc/resources.h
+++ b/arch/linux/parisc/resources.h
diff --git a/hardinfo2/arch/linux/parisc/samba.h b/arch/linux/parisc/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/parisc/samba.h
+++ b/arch/linux/parisc/samba.h
diff --git a/hardinfo2/arch/linux/parisc/sensors.h b/arch/linux/parisc/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/parisc/sensors.h
+++ b/arch/linux/parisc/sensors.h
diff --git a/hardinfo2/arch/linux/parisc/storage.h b/arch/linux/parisc/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/parisc/storage.h
+++ b/arch/linux/parisc/storage.h
diff --git a/hardinfo2/arch/linux/parisc/uptime.h b/arch/linux/parisc/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/parisc/uptime.h
+++ b/arch/linux/parisc/uptime.h
diff --git a/hardinfo2/arch/linux/parisc/usb.h b/arch/linux/parisc/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/parisc/usb.h
+++ b/arch/linux/parisc/usb.h
diff --git a/hardinfo2/arch/linux/ppc/alsa.h b/arch/linux/ppc/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/ppc/alsa.h
+++ b/arch/linux/ppc/alsa.h
diff --git a/hardinfo2/arch/linux/ppc/battery.h b/arch/linux/ppc/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/ppc/battery.h
+++ b/arch/linux/ppc/battery.h
diff --git a/hardinfo2/arch/linux/ppc/boots.h b/arch/linux/ppc/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/ppc/boots.h
+++ b/arch/linux/ppc/boots.h
diff --git a/hardinfo2/arch/linux/ppc/devmemory.h b/arch/linux/ppc/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/ppc/devmemory.h
+++ b/arch/linux/ppc/devmemory.h
diff --git a/hardinfo2/arch/linux/ppc/filesystem.h b/arch/linux/ppc/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/ppc/filesystem.h
+++ b/arch/linux/ppc/filesystem.h
diff --git a/hardinfo2/arch/linux/ppc/inputdevices.h b/arch/linux/ppc/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/ppc/inputdevices.h
+++ b/arch/linux/ppc/inputdevices.h
diff --git a/hardinfo2/arch/linux/ppc/loadavg.h b/arch/linux/ppc/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/ppc/loadavg.h
+++ b/arch/linux/ppc/loadavg.h
diff --git a/hardinfo2/arch/linux/ppc/memory.h b/arch/linux/ppc/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/ppc/memory.h
+++ b/arch/linux/ppc/memory.h
diff --git a/hardinfo2/arch/linux/ppc/modules.h b/arch/linux/ppc/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/ppc/modules.h
+++ b/arch/linux/ppc/modules.h
diff --git a/hardinfo2/arch/linux/ppc/net.h b/arch/linux/ppc/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/ppc/net.h
+++ b/arch/linux/ppc/net.h
diff --git a/hardinfo2/arch/linux/ppc/nfs.h b/arch/linux/ppc/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/ppc/nfs.h
+++ b/arch/linux/ppc/nfs.h
diff --git a/hardinfo2/arch/linux/ppc/os.h b/arch/linux/ppc/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/ppc/os.h
+++ b/arch/linux/ppc/os.h
diff --git a/hardinfo2/arch/linux/ppc/pci.h b/arch/linux/ppc/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/ppc/pci.h
+++ b/arch/linux/ppc/pci.h
diff --git a/hardinfo2/arch/linux/ppc/processor.h b/arch/linux/ppc/processor.h
index 863b2eb7..863b2eb7 100644
--- a/hardinfo2/arch/linux/ppc/processor.h
+++ b/arch/linux/ppc/processor.h
diff --git a/hardinfo2/arch/linux/ppc/resources.h b/arch/linux/ppc/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/ppc/resources.h
+++ b/arch/linux/ppc/resources.h
diff --git a/hardinfo2/arch/linux/ppc/samba.h b/arch/linux/ppc/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/ppc/samba.h
+++ b/arch/linux/ppc/samba.h
diff --git a/hardinfo2/arch/linux/ppc/sensors.h b/arch/linux/ppc/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/ppc/sensors.h
+++ b/arch/linux/ppc/sensors.h
diff --git a/hardinfo2/arch/linux/ppc/storage.h b/arch/linux/ppc/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/ppc/storage.h
+++ b/arch/linux/ppc/storage.h
diff --git a/hardinfo2/arch/linux/ppc/uptime.h b/arch/linux/ppc/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/ppc/uptime.h
+++ b/arch/linux/ppc/uptime.h
diff --git a/hardinfo2/arch/linux/ppc/usb.h b/arch/linux/ppc/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/ppc/usb.h
+++ b/arch/linux/ppc/usb.h
diff --git a/hardinfo2/arch/linux/s390/alsa.h b/arch/linux/s390/alsa.h
index ede8a364..ede8a364 120000
--- a/hardinfo2/arch/linux/s390/alsa.h
+++ b/arch/linux/s390/alsa.h
diff --git a/hardinfo2/arch/linux/s390/battery.h b/arch/linux/s390/battery.h
index ed7360e1..ed7360e1 120000
--- a/hardinfo2/arch/linux/s390/battery.h
+++ b/arch/linux/s390/battery.h
diff --git a/hardinfo2/arch/linux/s390/boots.h b/arch/linux/s390/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/s390/boots.h
+++ b/arch/linux/s390/boots.h
diff --git a/hardinfo2/arch/linux/s390/devmemory.h b/arch/linux/s390/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/s390/devmemory.h
+++ b/arch/linux/s390/devmemory.h
diff --git a/hardinfo2/arch/linux/s390/filesystem.h b/arch/linux/s390/filesystem.h
index d884bcd0..d884bcd0 120000
--- a/hardinfo2/arch/linux/s390/filesystem.h
+++ b/arch/linux/s390/filesystem.h
diff --git a/hardinfo2/arch/linux/s390/inputdevices.h b/arch/linux/s390/inputdevices.h
index 0f594231..0f594231 120000
--- a/hardinfo2/arch/linux/s390/inputdevices.h
+++ b/arch/linux/s390/inputdevices.h
diff --git a/hardinfo2/arch/linux/s390/loadavg.h b/arch/linux/s390/loadavg.h
index 1f64e107..1f64e107 120000
--- a/hardinfo2/arch/linux/s390/loadavg.h
+++ b/arch/linux/s390/loadavg.h
diff --git a/hardinfo2/arch/linux/s390/memory.h b/arch/linux/s390/memory.h
index 64c6e0ed..64c6e0ed 120000
--- a/hardinfo2/arch/linux/s390/memory.h
+++ b/arch/linux/s390/memory.h
diff --git a/hardinfo2/arch/linux/s390/modules.h b/arch/linux/s390/modules.h
index d21c9a20..d21c9a20 120000
--- a/hardinfo2/arch/linux/s390/modules.h
+++ b/arch/linux/s390/modules.h
diff --git a/hardinfo2/arch/linux/s390/net.h b/arch/linux/s390/net.h
index 488b5ae3..488b5ae3 120000
--- a/hardinfo2/arch/linux/s390/net.h
+++ b/arch/linux/s390/net.h
diff --git a/hardinfo2/arch/linux/s390/nfs.h b/arch/linux/s390/nfs.h
index 73e0b8c9..73e0b8c9 120000
--- a/hardinfo2/arch/linux/s390/nfs.h
+++ b/arch/linux/s390/nfs.h
diff --git a/hardinfo2/arch/linux/s390/os.h b/arch/linux/s390/os.h
index 44051626..44051626 120000
--- a/hardinfo2/arch/linux/s390/os.h
+++ b/arch/linux/s390/os.h
diff --git a/hardinfo2/arch/linux/s390/pci.h b/arch/linux/s390/pci.h
index 8df04a0e..8df04a0e 120000
--- a/hardinfo2/arch/linux/s390/pci.h
+++ b/arch/linux/s390/pci.h
diff --git a/hardinfo2/arch/linux/s390/processor.h b/arch/linux/s390/processor.h
index 25dab8ca..25dab8ca 100644
--- a/hardinfo2/arch/linux/s390/processor.h
+++ b/arch/linux/s390/processor.h
diff --git a/hardinfo2/arch/linux/s390/resources.h b/arch/linux/s390/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/s390/resources.h
+++ b/arch/linux/s390/resources.h
diff --git a/hardinfo2/arch/linux/s390/samba.h b/arch/linux/s390/samba.h
index ebab9b11..ebab9b11 120000
--- a/hardinfo2/arch/linux/s390/samba.h
+++ b/arch/linux/s390/samba.h
diff --git a/hardinfo2/arch/linux/s390/sensors.h b/arch/linux/s390/sensors.h
index 3b799377..3b799377 120000
--- a/hardinfo2/arch/linux/s390/sensors.h
+++ b/arch/linux/s390/sensors.h
diff --git a/hardinfo2/arch/linux/s390/storage.h b/arch/linux/s390/storage.h
index 3ea886ce..3ea886ce 120000
--- a/hardinfo2/arch/linux/s390/storage.h
+++ b/arch/linux/s390/storage.h
diff --git a/hardinfo2/arch/linux/s390/uptime.h b/arch/linux/s390/uptime.h
index a5bac980..a5bac980 120000
--- a/hardinfo2/arch/linux/s390/uptime.h
+++ b/arch/linux/s390/uptime.h
diff --git a/hardinfo2/arch/linux/s390/usb.h b/arch/linux/s390/usb.h
index aee3046c..aee3046c 120000
--- a/hardinfo2/arch/linux/s390/usb.h
+++ b/arch/linux/s390/usb.h
diff --git a/hardinfo2/arch/linux/sh/alsa.h b/arch/linux/sh/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/sh/alsa.h
+++ b/arch/linux/sh/alsa.h
diff --git a/hardinfo2/arch/linux/sh/battery.h b/arch/linux/sh/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/sh/battery.h
+++ b/arch/linux/sh/battery.h
diff --git a/hardinfo2/arch/linux/sh/boots.h b/arch/linux/sh/boots.h
index e7ef0408..e7ef0408 120000
--- a/hardinfo2/arch/linux/sh/boots.h
+++ b/arch/linux/sh/boots.h
diff --git a/hardinfo2/arch/linux/sh/devmemory.h b/arch/linux/sh/devmemory.h
index 5b1b866f..5b1b866f 120000
--- a/hardinfo2/arch/linux/sh/devmemory.h
+++ b/arch/linux/sh/devmemory.h
diff --git a/hardinfo2/arch/linux/sh/filesystem.h b/arch/linux/sh/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/sh/filesystem.h
+++ b/arch/linux/sh/filesystem.h
diff --git a/hardinfo2/arch/linux/sh/inputdevices.h b/arch/linux/sh/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/sh/inputdevices.h
+++ b/arch/linux/sh/inputdevices.h
diff --git a/hardinfo2/arch/linux/sh/loadavg.h b/arch/linux/sh/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/sh/loadavg.h
+++ b/arch/linux/sh/loadavg.h
diff --git a/hardinfo2/arch/linux/sh/memory.h b/arch/linux/sh/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/sh/memory.h
+++ b/arch/linux/sh/memory.h
diff --git a/hardinfo2/arch/linux/sh/modules.h b/arch/linux/sh/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/sh/modules.h
+++ b/arch/linux/sh/modules.h
diff --git a/hardinfo2/arch/linux/sh/net.h b/arch/linux/sh/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/sh/net.h
+++ b/arch/linux/sh/net.h
diff --git a/hardinfo2/arch/linux/sh/nfs.h b/arch/linux/sh/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/sh/nfs.h
+++ b/arch/linux/sh/nfs.h
diff --git a/hardinfo2/arch/linux/sh/os.h b/arch/linux/sh/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/sh/os.h
+++ b/arch/linux/sh/os.h
diff --git a/hardinfo2/arch/linux/sh/pci.h b/arch/linux/sh/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/sh/pci.h
+++ b/arch/linux/sh/pci.h
diff --git a/hardinfo2/arch/linux/sh/processor.h b/arch/linux/sh/processor.h
index de33ee91..de33ee91 100644
--- a/hardinfo2/arch/linux/sh/processor.h
+++ b/arch/linux/sh/processor.h
diff --git a/hardinfo2/arch/linux/sh/resources.h b/arch/linux/sh/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/sh/resources.h
+++ b/arch/linux/sh/resources.h
diff --git a/hardinfo2/arch/linux/sh/samba.h b/arch/linux/sh/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/sh/samba.h
+++ b/arch/linux/sh/samba.h
diff --git a/hardinfo2/arch/linux/sh/sensors.h b/arch/linux/sh/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/sh/sensors.h
+++ b/arch/linux/sh/sensors.h
diff --git a/hardinfo2/arch/linux/sh/storage.h b/arch/linux/sh/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/sh/storage.h
+++ b/arch/linux/sh/storage.h
diff --git a/hardinfo2/arch/linux/sh/uptime.h b/arch/linux/sh/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/sh/uptime.h
+++ b/arch/linux/sh/uptime.h
diff --git a/hardinfo2/arch/linux/sh/usb.h b/arch/linux/sh/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/sh/usb.h
+++ b/arch/linux/sh/usb.h
diff --git a/hardinfo2/arch/linux/sparc/alsa.h b/arch/linux/sparc/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/sparc/alsa.h
+++ b/arch/linux/sparc/alsa.h
diff --git a/hardinfo2/arch/linux/sparc/battery.h b/arch/linux/sparc/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/sparc/battery.h
+++ b/arch/linux/sparc/battery.h
diff --git a/hardinfo2/arch/linux/sparc/boots.h b/arch/linux/sparc/boots.h
index 97384500..97384500 120000
--- a/hardinfo2/arch/linux/sparc/boots.h
+++ b/arch/linux/sparc/boots.h
diff --git a/hardinfo2/arch/linux/sparc/devmemory.h b/arch/linux/sparc/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/sparc/devmemory.h
+++ b/arch/linux/sparc/devmemory.h
diff --git a/hardinfo2/arch/linux/sparc/filesystem.h b/arch/linux/sparc/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/sparc/filesystem.h
+++ b/arch/linux/sparc/filesystem.h
diff --git a/hardinfo2/arch/linux/sparc/inputdevices.h b/arch/linux/sparc/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/sparc/inputdevices.h
+++ b/arch/linux/sparc/inputdevices.h
diff --git a/hardinfo2/arch/linux/sparc/loadavg.h b/arch/linux/sparc/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/sparc/loadavg.h
+++ b/arch/linux/sparc/loadavg.h
diff --git a/hardinfo2/arch/linux/sparc/memory.h b/arch/linux/sparc/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/sparc/memory.h
+++ b/arch/linux/sparc/memory.h
diff --git a/hardinfo2/arch/linux/sparc/modules.h b/arch/linux/sparc/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/sparc/modules.h
+++ b/arch/linux/sparc/modules.h
diff --git a/hardinfo2/arch/linux/sparc/net.h b/arch/linux/sparc/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/sparc/net.h
+++ b/arch/linux/sparc/net.h
diff --git a/hardinfo2/arch/linux/sparc/nfs.h b/arch/linux/sparc/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/sparc/nfs.h
+++ b/arch/linux/sparc/nfs.h
diff --git a/hardinfo2/arch/linux/sparc/os.h b/arch/linux/sparc/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/sparc/os.h
+++ b/arch/linux/sparc/os.h
diff --git a/hardinfo2/arch/linux/sparc/pci.h b/arch/linux/sparc/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/sparc/pci.h
+++ b/arch/linux/sparc/pci.h
diff --git a/hardinfo2/arch/linux/sparc/processor.h b/arch/linux/sparc/processor.h
index 0272c963..0272c963 100644
--- a/hardinfo2/arch/linux/sparc/processor.h
+++ b/arch/linux/sparc/processor.h
diff --git a/hardinfo2/arch/linux/sparc/resources.h b/arch/linux/sparc/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/sparc/resources.h
+++ b/arch/linux/sparc/resources.h
diff --git a/hardinfo2/arch/linux/sparc/samba.h b/arch/linux/sparc/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/sparc/samba.h
+++ b/arch/linux/sparc/samba.h
diff --git a/hardinfo2/arch/linux/sparc/sensors.h b/arch/linux/sparc/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/sparc/sensors.h
+++ b/arch/linux/sparc/sensors.h
diff --git a/hardinfo2/arch/linux/sparc/storage.h b/arch/linux/sparc/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/sparc/storage.h
+++ b/arch/linux/sparc/storage.h
diff --git a/hardinfo2/arch/linux/sparc/uptime.h b/arch/linux/sparc/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/sparc/uptime.h
+++ b/arch/linux/sparc/uptime.h
diff --git a/hardinfo2/arch/linux/sparc/usb.h b/arch/linux/sparc/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/sparc/usb.h
+++ b/arch/linux/sparc/usb.h
diff --git a/hardinfo2/arch/linux/x86/alsa.h b/arch/linux/x86/alsa.h
index 0216845a..0216845a 120000
--- a/hardinfo2/arch/linux/x86/alsa.h
+++ b/arch/linux/x86/alsa.h
diff --git a/hardinfo2/arch/linux/x86/battery.h b/arch/linux/x86/battery.h
index e4c794f2..e4c794f2 120000
--- a/hardinfo2/arch/linux/x86/battery.h
+++ b/arch/linux/x86/battery.h
diff --git a/hardinfo2/arch/linux/x86/boots.h b/arch/linux/x86/boots.h
index e7ef0408..e7ef0408 120000
--- a/hardinfo2/arch/linux/x86/boots.h
+++ b/arch/linux/x86/boots.h
diff --git a/hardinfo2/arch/linux/x86/devmemory.h b/arch/linux/x86/devmemory.h
index f8a833e7..f8a833e7 120000
--- a/hardinfo2/arch/linux/x86/devmemory.h
+++ b/arch/linux/x86/devmemory.h
diff --git a/hardinfo2/arch/linux/x86/dmi.h b/arch/linux/x86/dmi.h
index 1a285fbd..1a285fbd 120000
--- a/hardinfo2/arch/linux/x86/dmi.h
+++ b/arch/linux/x86/dmi.h
diff --git a/hardinfo2/arch/linux/x86/filesystem.h b/arch/linux/x86/filesystem.h
index 6b325b40..6b325b40 120000
--- a/hardinfo2/arch/linux/x86/filesystem.h
+++ b/arch/linux/x86/filesystem.h
diff --git a/hardinfo2/arch/linux/x86/inputdevices.h b/arch/linux/x86/inputdevices.h
index b9226a29..b9226a29 120000
--- a/hardinfo2/arch/linux/x86/inputdevices.h
+++ b/arch/linux/x86/inputdevices.h
diff --git a/hardinfo2/arch/linux/x86/loadavg.h b/arch/linux/x86/loadavg.h
index daaed6d5..daaed6d5 120000
--- a/hardinfo2/arch/linux/x86/loadavg.h
+++ b/arch/linux/x86/loadavg.h
diff --git a/hardinfo2/arch/linux/x86/memory.h b/arch/linux/x86/memory.h
index 5ffc013e..5ffc013e 120000
--- a/hardinfo2/arch/linux/x86/memory.h
+++ b/arch/linux/x86/memory.h
diff --git a/hardinfo2/arch/linux/x86/modules.h b/arch/linux/x86/modules.h
index 8ce5a808..8ce5a808 120000
--- a/hardinfo2/arch/linux/x86/modules.h
+++ b/arch/linux/x86/modules.h
diff --git a/hardinfo2/arch/linux/x86/net.h b/arch/linux/x86/net.h
index 72d77b26..72d77b26 120000
--- a/hardinfo2/arch/linux/x86/net.h
+++ b/arch/linux/x86/net.h
diff --git a/hardinfo2/arch/linux/x86/nfs.h b/arch/linux/x86/nfs.h
index 3d1048da..3d1048da 120000
--- a/hardinfo2/arch/linux/x86/nfs.h
+++ b/arch/linux/x86/nfs.h
diff --git a/hardinfo2/arch/linux/x86/os.h b/arch/linux/x86/os.h
index ef547be5..ef547be5 120000
--- a/hardinfo2/arch/linux/x86/os.h
+++ b/arch/linux/x86/os.h
diff --git a/hardinfo2/arch/linux/x86/pci.h b/arch/linux/x86/pci.h
index 63760048..63760048 120000
--- a/hardinfo2/arch/linux/x86/pci.h
+++ b/arch/linux/x86/pci.h
diff --git a/hardinfo2/arch/linux/x86/processor.h b/arch/linux/x86/processor.h
index 273b0578..273b0578 100644
--- a/hardinfo2/arch/linux/x86/processor.h
+++ b/arch/linux/x86/processor.h
diff --git a/hardinfo2/arch/linux/x86/resources.h b/arch/linux/x86/resources.h
index 20a4815d..20a4815d 120000
--- a/hardinfo2/arch/linux/x86/resources.h
+++ b/arch/linux/x86/resources.h
diff --git a/hardinfo2/arch/linux/x86/samba.h b/arch/linux/x86/samba.h
index 9227f722..9227f722 120000
--- a/hardinfo2/arch/linux/x86/samba.h
+++ b/arch/linux/x86/samba.h
diff --git a/hardinfo2/arch/linux/x86/sensors.h b/arch/linux/x86/sensors.h
index 35e5f37a..35e5f37a 120000
--- a/hardinfo2/arch/linux/x86/sensors.h
+++ b/arch/linux/x86/sensors.h
diff --git a/hardinfo2/arch/linux/x86/storage.h b/arch/linux/x86/storage.h
index 55b68de3..55b68de3 120000
--- a/hardinfo2/arch/linux/x86/storage.h
+++ b/arch/linux/x86/storage.h
diff --git a/hardinfo2/arch/linux/x86/uptime.h b/arch/linux/x86/uptime.h
index 78c026ff..78c026ff 120000
--- a/hardinfo2/arch/linux/x86/uptime.h
+++ b/arch/linux/x86/uptime.h
diff --git a/hardinfo2/arch/linux/x86/usb.h b/arch/linux/x86/usb.h
index 8b8fbb5d..8b8fbb5d 120000
--- a/hardinfo2/arch/linux/x86/usb.h
+++ b/arch/linux/x86/usb.h
diff --git a/hardinfo2/arch/linux/x86_64 b/arch/linux/x86_64
index f4bad791..f4bad791 120000
--- a/hardinfo2/arch/linux/x86_64
+++ b/arch/linux/x86_64
diff --git a/hardinfo2/autopackage/default.apspec b/autopackage/default.apspec
index 2aea83a7..2aea83a7 100644
--- a/hardinfo2/autopackage/default.apspec
+++ b/autopackage/default.apspec
diff --git a/hardinfo2/benchmark.conf b/benchmark.conf
index ef2162da..ef2162da 100644
--- a/hardinfo2/benchmark.conf
+++ b/benchmark.conf
diff --git a/hardinfo2/benchmark.data b/benchmark.data
index efb964db..efb964db 100644
--- a/hardinfo2/benchmark.data
+++ b/benchmark.data
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 00000000..2c8440c8
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,35 @@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define VERSION			"@HARDINFO_VERSION@"
+
+#define ARCH			"ARCH_@HARDINFO_ARCH@"
+#define OS			"@HARDINFO_OS@"
+#define PLATFORM		OS "-" ARCH
+#define KERNEL			"@CMAKE_SYSTEM_VERSION@"
+#define HOSTNAME		""
+#define ARCH_@HARDINFO_ARCH@
+
+#define LIBPREFIX		"@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
+#define PREFIX			"@CMAKE_INSTALL_PREFIX@/share/hardinfo"
+
+#cmakedefine LIBSOUP_FOUND
+#cmakedefine HARDINFO_DEBUG	@HARDINFO_DEBUG@
+
+#ifdef LIBSOUP_FOUND
+#	define HAS_LIBSOUP
+#endif	/* LIBSOUP_FOUND */
+
+#if defined(HARDINFO_DEBUG) && (HARDINFO_DEBUG==1)
+#	define RELEASE 0
+#	define DEBUG(msg,...) fprintf(stderr, "*** %s:%d (%s) *** " msg "\n", \
+        	           __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)
+#else
+#	define RELEASE 1
+#	define DEBUG(msg,...)
+#endif	/* HARDINFO_DEBUG */
+
+#define ENABLE_BINRELOC 1
+#define HAS_LINUX_WE 1
+
+#endif	/* __CONFIG_H__ */
\ No newline at end of file
diff --git a/hardinfo2/doc/index.hlp b/doc/index.hlp
index b1abff39..b1abff39 100644
--- a/hardinfo2/doc/index.hlp
+++ b/doc/index.hlp
diff --git a/hardinfo2/hardinfo.desktop b/hardinfo.desktop
index 523432f1..523432f1 100644
--- a/hardinfo2/hardinfo.desktop
+++ b/hardinfo.desktop
diff --git a/hardinfo2/util/binreloc.c b/hardinfo/binreloc.c
index 1d1acfe6..1d1acfe6 100644
--- a/hardinfo2/util/binreloc.c
+++ b/hardinfo/binreloc.c
diff --git a/hardinfo2/util/expr.c b/hardinfo/expr.c
index 32e303d7..32e303d7 100644
--- a/hardinfo2/util/expr.c
+++ b/hardinfo/expr.c
diff --git a/hardinfo2/hardinfo/hardinfo.c b/hardinfo/hardinfo.c
index 784a3c06..784a3c06 100644
--- a/hardinfo2/hardinfo/hardinfo.c
+++ b/hardinfo/hardinfo.c
diff --git a/hardinfo2/util/socket.c b/hardinfo/socket.c
index 339df30e..339df30e 100644
--- a/hardinfo2/util/socket.c
+++ b/hardinfo/socket.c
diff --git a/hardinfo2/util/util.c b/hardinfo/util.c
index fb995406..fb995406 100644
--- a/hardinfo2/util/util.c
+++ b/hardinfo/util.c
diff --git a/hardinfo2/util/vendor.c b/hardinfo/vendor.c
index 86dba97a..86dba97a 100644
--- a/hardinfo2/util/vendor.c
+++ b/hardinfo/vendor.c
diff --git a/hardinfo2/help-viewer/egg-markdown.c b/help-viewer/egg-markdown.c
index 4056d4f9..4056d4f9 100644
--- a/hardinfo2/help-viewer/egg-markdown.c
+++ b/help-viewer/egg-markdown.c
diff --git a/hardinfo2/help-viewer/help-viewer.c b/help-viewer/help-viewer.c
index ace6ef37..ace6ef37 100644
--- a/hardinfo2/help-viewer/help-viewer.c
+++ b/help-viewer/help-viewer.c
diff --git a/hardinfo2/help-viewer/markdown-text-view.c b/help-viewer/markdown-text-view.c
index 6bfcc131..6bfcc131 100644
--- a/hardinfo2/help-viewer/markdown-text-view.c
+++ b/help-viewer/markdown-text-view.c
diff --git a/hardinfo2/includes/benchmark.h b/includes/benchmark.h
index 27bcbf4c..27bcbf4c 100644
--- a/hardinfo2/includes/benchmark.h
+++ b/includes/benchmark.h
diff --git a/hardinfo2/includes/binreloc.h b/includes/binreloc.h
index 3bf48bc6..3bf48bc6 100644
--- a/hardinfo2/includes/binreloc.h
+++ b/includes/binreloc.h
diff --git a/hardinfo2/includes/blowfish.h b/includes/blowfish.h
index 3f33e945..3f33e945 100644
--- a/hardinfo2/includes/blowfish.h
+++ b/includes/blowfish.h
diff --git a/hardinfo2/includes/callbacks.h b/includes/callbacks.h
index d53e1861..d53e1861 100644
--- a/hardinfo2/includes/callbacks.h
+++ b/includes/callbacks.h
diff --git a/hardinfo2/includes/computer.h b/includes/computer.h
index 05f7c4be..05f7c4be 100644
--- a/hardinfo2/includes/computer.h
+++ b/includes/computer.h
diff --git a/hardinfo2/includes/devices.h b/includes/devices.h
index adbffd8c..adbffd8c 100644
--- a/hardinfo2/includes/devices.h
+++ b/includes/devices.h
diff --git a/hardinfo2/includes/egg-markdown.h b/includes/egg-markdown.h
index 4475b9f0..4475b9f0 100644
--- a/hardinfo2/includes/egg-markdown.h
+++ b/includes/egg-markdown.h
diff --git a/hardinfo2/includes/expr.h b/includes/expr.h
index 4bda6b72..4bda6b72 100644
--- a/hardinfo2/includes/expr.h
+++ b/includes/expr.h
diff --git a/hardinfo2/includes/fftbench.h b/includes/fftbench.h
index 7c0afc3d..7c0afc3d 100644
--- a/hardinfo2/includes/fftbench.h
+++ b/includes/fftbench.h
diff --git a/hardinfo2/includes/guibench.h b/includes/guibench.h
index d24403bc..d24403bc 100644
--- a/hardinfo2/includes/guibench.h
+++ b/includes/guibench.h
diff --git a/hardinfo2/includes/hardinfo.h b/includes/hardinfo.h
index 42a92a30..42a92a30 100644
--- a/hardinfo2/includes/hardinfo.h
+++ b/includes/hardinfo.h
diff --git a/hardinfo2/includes/help-viewer.h b/includes/help-viewer.h
index 688ff325..688ff325 100644
--- a/hardinfo2/includes/help-viewer.h
+++ b/includes/help-viewer.h
diff --git a/hardinfo2/includes/iconcache.h b/includes/iconcache.h
index 97f59a82..97f59a82 100644
--- a/hardinfo2/includes/iconcache.h
+++ b/includes/iconcache.h
diff --git a/hardinfo2/includes/loadgraph.h b/includes/loadgraph.h
index 3a53f793..3a53f793 100644
--- a/hardinfo2/includes/loadgraph.h
+++ b/includes/loadgraph.h
diff --git a/hardinfo2/includes/markdown-text-view.h b/includes/markdown-text-view.h
index 648ea39c..648ea39c 100644
--- a/hardinfo2/includes/markdown-text-view.h
+++ b/includes/markdown-text-view.h
diff --git a/hardinfo2/includes/md5.h b/includes/md5.h
index 1522170c..1522170c 100644
--- a/hardinfo2/includes/md5.h
+++ b/includes/md5.h
diff --git a/hardinfo2/includes/menu.h b/includes/menu.h
index 361b2323..361b2323 100644
--- a/hardinfo2/includes/menu.h
+++ b/includes/menu.h
diff --git a/hardinfo2/includes/network.h b/includes/network.h
index e8113089..e8113089 100644
--- a/hardinfo2/includes/network.h
+++ b/includes/network.h
diff --git a/hardinfo2/includes/nqueens.h b/includes/nqueens.h
index a4be93f0..a4be93f0 100644
--- a/hardinfo2/includes/nqueens.h
+++ b/includes/nqueens.h
diff --git a/hardinfo2/includes/remote.h b/includes/remote.h
index 6a988a3b..6a988a3b 100644
--- a/hardinfo2/includes/remote.h
+++ b/includes/remote.h
diff --git a/hardinfo2/includes/report.h b/includes/report.h
index 782621cb..782621cb 100644
--- a/hardinfo2/includes/report.h
+++ b/includes/report.h
diff --git a/hardinfo2/includes/sha1.h b/includes/sha1.h
index 573ff8ac..573ff8ac 100644
--- a/hardinfo2/includes/sha1.h
+++ b/includes/sha1.h
diff --git a/hardinfo2/includes/shell.h b/includes/shell.h
index 2eb9e6d2..2eb9e6d2 100644
--- a/hardinfo2/includes/shell.h
+++ b/includes/shell.h
diff --git a/hardinfo2/includes/socket.h b/includes/socket.h
index 7c44837e..7c44837e 100644
--- a/hardinfo2/includes/socket.h
+++ b/includes/socket.h
diff --git a/hardinfo2/includes/ssh-conn.h b/includes/ssh-conn.h
index b1b0a9ca..b1b0a9ca 100644
--- a/hardinfo2/includes/ssh-conn.h
+++ b/includes/ssh-conn.h
diff --git a/hardinfo2/includes/stock.h b/includes/stock.h
index 706e5c51..706e5c51 100644
--- a/hardinfo2/includes/stock.h
+++ b/includes/stock.h
diff --git a/hardinfo2/includes/syncmanager.h b/includes/syncmanager.h
index ae0ed267..ae0ed267 100644
--- a/hardinfo2/includes/syncmanager.h
+++ b/includes/syncmanager.h
diff --git a/hardinfo2/includes/test-utils.h b/includes/test-utils.h
index 21cac6b5..21cac6b5 100644
--- a/hardinfo2/includes/test-utils.h
+++ b/includes/test-utils.h
diff --git a/hardinfo2/includes/uidefs.h b/includes/uidefs.h
index a54823ad..a54823ad 100644
--- a/hardinfo2/includes/uidefs.h
+++ b/includes/uidefs.h
diff --git a/hardinfo2/includes/vendor.h b/includes/vendor.h
index 778e2ea3..778e2ea3 100644
--- a/hardinfo2/includes/vendor.h
+++ b/includes/vendor.h
diff --git a/hardinfo2/includes/x86/processor-platform.h b/includes/x86/processor-platform.h
index dd9ae9d9..dd9ae9d9 100644
--- a/hardinfo2/includes/x86/processor-platform.h
+++ b/includes/x86/processor-platform.h
diff --git a/hardinfo2/includes/xmlrpc-client.h b/includes/xmlrpc-client.h
index 32fad08c..32fad08c 100644
--- a/hardinfo2/includes/xmlrpc-client.h
+++ b/includes/xmlrpc-client.h
diff --git a/hardinfo2/includes/xmlrpc-server.h b/includes/xmlrpc-server.h
index e608b711..e608b711 100644
--- a/hardinfo2/includes/xmlrpc-server.h
+++ b/includes/xmlrpc-server.h
diff --git a/hardinfo2/modules/benchmark.c b/modules/benchmark.c
index 1f85064a..1f85064a 100644
--- a/hardinfo2/modules/benchmark.c
+++ b/modules/benchmark.c
diff --git a/hardinfo2/modules/benchmark/blowfish.c b/modules/benchmark/blowfish.c
index 034315ab..034315ab 100644
--- a/hardinfo2/modules/benchmark/blowfish.c
+++ b/modules/benchmark/blowfish.c
diff --git a/hardinfo2/modules/benchmark/cryptohash.c b/modules/benchmark/cryptohash.c
index 99a19140..99a19140 100644
--- a/hardinfo2/modules/benchmark/cryptohash.c
+++ b/modules/benchmark/cryptohash.c
diff --git a/hardinfo2/modules/benchmark/drawing.c b/modules/benchmark/drawing.c
index 6f01fe6b..6f01fe6b 100644
--- a/hardinfo2/modules/benchmark/drawing.c
+++ b/modules/benchmark/drawing.c
diff --git a/hardinfo2/modules/benchmark/fbench.c b/modules/benchmark/fbench.c
index df1b8e19..df1b8e19 100644
--- a/hardinfo2/modules/benchmark/fbench.c
+++ b/modules/benchmark/fbench.c
diff --git a/hardinfo2/modules/benchmark/fft.c b/modules/benchmark/fft.c
index f1a0ced8..f1a0ced8 100644
--- a/hardinfo2/modules/benchmark/fft.c
+++ b/modules/benchmark/fft.c
diff --git a/hardinfo2/modules/benchmark/fftbench.c b/modules/benchmark/fftbench.c
index dc25dfd6..dc25dfd6 100644
--- a/hardinfo2/modules/benchmark/fftbench.c
+++ b/modules/benchmark/fftbench.c
diff --git a/hardinfo2/modules/benchmark/fib.c b/modules/benchmark/fib.c
index 3ff54dba..3ff54dba 100644
--- a/hardinfo2/modules/benchmark/fib.c
+++ b/modules/benchmark/fib.c
diff --git a/hardinfo2/modules/benchmark/guibench.c b/modules/benchmark/guibench.c
index b9573278..b9573278 100644
--- a/hardinfo2/modules/benchmark/guibench.c
+++ b/modules/benchmark/guibench.c
diff --git a/hardinfo2/modules/benchmark/md5.c b/modules/benchmark/md5.c
index 70f39c45..70f39c45 100644
--- a/hardinfo2/modules/benchmark/md5.c
+++ b/modules/benchmark/md5.c
diff --git a/hardinfo2/modules/benchmark/nqueens.c b/modules/benchmark/nqueens.c
index 838731c4..838731c4 100644
--- a/hardinfo2/modules/benchmark/nqueens.c
+++ b/modules/benchmark/nqueens.c
diff --git a/hardinfo2/modules/benchmark/raytrace.c b/modules/benchmark/raytrace.c
index 9fc6361e..9fc6361e 100644
--- a/hardinfo2/modules/benchmark/raytrace.c
+++ b/modules/benchmark/raytrace.c
diff --git a/hardinfo2/modules/benchmark/sha1.c b/modules/benchmark/sha1.c
index b94ce254..b94ce254 100644
--- a/hardinfo2/modules/benchmark/sha1.c
+++ b/modules/benchmark/sha1.c
diff --git a/hardinfo2/modules/computer.c b/modules/computer.c
index cb349408..cb349408 100644
--- a/hardinfo2/modules/computer.c
+++ b/modules/computer.c
diff --git a/hardinfo2/modules/computer/alsa.c b/modules/computer/alsa.c
index f1ff3ad8..f1ff3ad8 100644
--- a/hardinfo2/modules/computer/alsa.c
+++ b/modules/computer/alsa.c
diff --git a/hardinfo2/modules/computer/boots.c b/modules/computer/boots.c
index 4a1023f6..4a1023f6 100644
--- a/hardinfo2/modules/computer/boots.c
+++ b/modules/computer/boots.c
diff --git a/hardinfo2/modules/computer/display.c b/modules/computer/display.c
index ce23bbfd..ce23bbfd 100644
--- a/hardinfo2/modules/computer/display.c
+++ b/modules/computer/display.c
diff --git a/hardinfo2/modules/computer/environment.c b/modules/computer/environment.c
index 8ef63b2d..8ef63b2d 100644
--- a/hardinfo2/modules/computer/environment.c
+++ b/modules/computer/environment.c
diff --git a/hardinfo2/modules/computer/filesystem.c b/modules/computer/filesystem.c
index fcd8cf31..fcd8cf31 100644
--- a/hardinfo2/modules/computer/filesystem.c
+++ b/modules/computer/filesystem.c
diff --git a/hardinfo2/modules/computer/languages.c b/modules/computer/languages.c
index 2808da1b..2808da1b 100644
--- a/hardinfo2/modules/computer/languages.c
+++ b/modules/computer/languages.c
diff --git a/hardinfo2/modules/computer/loadavg.c b/modules/computer/loadavg.c
index 523812be..523812be 100644
--- a/hardinfo2/modules/computer/loadavg.c
+++ b/modules/computer/loadavg.c
diff --git a/hardinfo2/modules/computer/memory.c b/modules/computer/memory.c
index 3d320e8a..3d320e8a 100644
--- a/hardinfo2/modules/computer/memory.c
+++ b/modules/computer/memory.c
diff --git a/hardinfo2/modules/computer/modules.c b/modules/computer/modules.c
index 195c444b..195c444b 100644
--- a/hardinfo2/modules/computer/modules.c
+++ b/modules/computer/modules.c
diff --git a/hardinfo2/modules/computer/os.c b/modules/computer/os.c
index 36b061fc..36b061fc 100644
--- a/hardinfo2/modules/computer/os.c
+++ b/modules/computer/os.c
diff --git a/hardinfo2/modules/computer/uptime.c b/modules/computer/uptime.c
index 8eb563fa..8eb563fa 100644
--- a/hardinfo2/modules/computer/uptime.c
+++ b/modules/computer/uptime.c
diff --git a/hardinfo2/modules/computer/users.c b/modules/computer/users.c
index e303ac6e..e303ac6e 100644
--- a/hardinfo2/modules/computer/users.c
+++ b/modules/computer/users.c
diff --git a/hardinfo2/modules/devices.c b/modules/devices.c
index c15a9db1..c15a9db1 100644
--- a/hardinfo2/modules/devices.c
+++ b/modules/devices.c
diff --git a/hardinfo2/modules/devices/battery.c b/modules/devices/battery.c
index 37416dbb..37416dbb 100644
--- a/hardinfo2/modules/devices/battery.c
+++ b/modules/devices/battery.c
diff --git a/hardinfo2/modules/devices/devmemory.c b/modules/devices/devmemory.c
index 8c89d567..8c89d567 100644
--- a/hardinfo2/modules/devices/devmemory.c
+++ b/modules/devices/devmemory.c
diff --git a/hardinfo2/modules/devices/dmi.c b/modules/devices/dmi.c
index 8cc45462..8cc45462 100644
--- a/hardinfo2/modules/devices/dmi.c
+++ b/modules/devices/dmi.c
diff --git a/hardinfo2/modules/devices/inputdevices.c b/modules/devices/inputdevices.c
index c280e218..c280e218 100644
--- a/hardinfo2/modules/devices/inputdevices.c
+++ b/modules/devices/inputdevices.c
diff --git a/hardinfo2/modules/devices/pci.c b/modules/devices/pci.c
index a8439019..a8439019 100644
--- a/hardinfo2/modules/devices/pci.c
+++ b/modules/devices/pci.c
diff --git a/hardinfo2/modules/devices/printers.c b/modules/devices/printers.c
index 80851a00..80851a00 100644
--- a/hardinfo2/modules/devices/printers.c
+++ b/modules/devices/printers.c
diff --git a/hardinfo2/modules/devices/resources.c b/modules/devices/resources.c
index 270000dd..270000dd 100644
--- a/hardinfo2/modules/devices/resources.c
+++ b/modules/devices/resources.c
diff --git a/hardinfo2/modules/devices/sensors.c b/modules/devices/sensors.c
index 9f02566d..9f02566d 100644
--- a/hardinfo2/modules/devices/sensors.c
+++ b/modules/devices/sensors.c
diff --git a/hardinfo2/modules/devices/storage.c b/modules/devices/storage.c
index 23ab1de2..23ab1de2 100644
--- a/hardinfo2/modules/devices/storage.c
+++ b/modules/devices/storage.c
diff --git a/hardinfo2/modules/devices/usb.c b/modules/devices/usb.c
index 39914dd0..39914dd0 100644
--- a/hardinfo2/modules/devices/usb.c
+++ b/modules/devices/usb.c
diff --git a/hardinfo2/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index aee409f1..aee409f1 100644
--- a/hardinfo2/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
diff --git a/hardinfo2/modules/network.c b/modules/network.c
index 168e04a9..168e04a9 100644
--- a/hardinfo2/modules/network.c
+++ b/modules/network.c
diff --git a/hardinfo2/modules/network/net.c b/modules/network/net.c
index c470bc37..c470bc37 100644
--- a/hardinfo2/modules/network/net.c
+++ b/modules/network/net.c
diff --git a/hardinfo2/modules/network/nfs.c b/modules/network/nfs.c
index 63b2a2e6..63b2a2e6 100644
--- a/hardinfo2/modules/network/nfs.c
+++ b/modules/network/nfs.c
diff --git a/hardinfo2/modules/network/samba.c b/modules/network/samba.c
index 71ba6ab6..71ba6ab6 100644
--- a/hardinfo2/modules/network/samba.c
+++ b/modules/network/samba.c
diff --git a/hardinfo2/pixmaps/about-modules.png b/pixmaps/about-modules.png
index 98086442..98086442 100644
--- a/hardinfo2/pixmaps/about-modules.png
+++ b/pixmaps/about-modules.png
diff --git a/hardinfo2/pixmaps/audio.png b/pixmaps/audio.png
index cc0d9ec5..cc0d9ec5 100644
--- a/hardinfo2/pixmaps/audio.png
+++ b/pixmaps/audio.png
diff --git a/hardinfo2/pixmaps/battery.png b/pixmaps/battery.png
index 172c2389..172c2389 100644
--- a/hardinfo2/pixmaps/battery.png
+++ b/pixmaps/battery.png
diff --git a/hardinfo2/pixmaps/benchmark.png b/pixmaps/benchmark.png
index b807f11d..b807f11d 100644
--- a/hardinfo2/pixmaps/benchmark.png
+++ b/pixmaps/benchmark.png
diff --git a/hardinfo2/pixmaps/blowfish.png b/pixmaps/blowfish.png
index 54a9ba83..54a9ba83 100644
--- a/hardinfo2/pixmaps/blowfish.png
+++ b/pixmaps/blowfish.png
diff --git a/hardinfo2/pixmaps/bluetooth.png b/pixmaps/bluetooth.png
index 4621658b..4621658b 100644
--- a/hardinfo2/pixmaps/bluetooth.png
+++ b/pixmaps/bluetooth.png
diff --git a/hardinfo2/pixmaps/boot.png b/pixmaps/boot.png
index 1151e48d..1151e48d 100644
--- a/hardinfo2/pixmaps/boot.png
+++ b/pixmaps/boot.png
diff --git a/hardinfo2/pixmaps/cdrom.png b/pixmaps/cdrom.png
index 52a23974..52a23974 100644
--- a/hardinfo2/pixmaps/cdrom.png
+++ b/pixmaps/cdrom.png
diff --git a/hardinfo2/pixmaps/close.png b/pixmaps/close.png
index 7d702c5b..7d702c5b 100644
--- a/hardinfo2/pixmaps/close.png
+++ b/pixmaps/close.png
diff --git a/hardinfo2/pixmaps/compress.png b/pixmaps/compress.png
index 1c4530ba..1c4530ba 100644
--- a/hardinfo2/pixmaps/compress.png
+++ b/pixmaps/compress.png
diff --git a/hardinfo2/pixmaps/computer.png b/pixmaps/computer.png
index b00cb150..b00cb150 100644
--- a/hardinfo2/pixmaps/computer.png
+++ b/pixmaps/computer.png
diff --git a/hardinfo2/pixmaps/cryptohash.png b/pixmaps/cryptohash.png
index b62f29ed..b62f29ed 100644
--- a/hardinfo2/pixmaps/cryptohash.png
+++ b/pixmaps/cryptohash.png
diff --git a/hardinfo2/pixmaps/dev_removable.png b/pixmaps/dev_removable.png
index d6c91e49..d6c91e49 100644
--- a/hardinfo2/pixmaps/dev_removable.png
+++ b/pixmaps/dev_removable.png
diff --git a/hardinfo2/pixmaps/devel.png b/pixmaps/devel.png
index 8aeebd6e..8aeebd6e 100644
--- a/hardinfo2/pixmaps/devel.png
+++ b/pixmaps/devel.png
diff --git a/hardinfo2/pixmaps/devices.png b/pixmaps/devices.png
index c21504c6..c21504c6 100644
--- a/hardinfo2/pixmaps/devices.png
+++ b/pixmaps/devices.png
diff --git a/hardinfo2/pixmaps/dialog-error.png b/pixmaps/dialog-error.png
index 7d6aaf6f..7d6aaf6f 100644
--- a/hardinfo2/pixmaps/dialog-error.png
+++ b/pixmaps/dialog-error.png
diff --git a/hardinfo2/pixmaps/dialog-information.png b/pixmaps/dialog-information.png
index 83b69935..83b69935 100644
--- a/hardinfo2/pixmaps/dialog-information.png
+++ b/pixmaps/dialog-information.png
diff --git a/hardinfo2/pixmaps/dialog-warning.png b/pixmaps/dialog-warning.png
index d5c4be43..d5c4be43 100644
--- a/hardinfo2/pixmaps/dialog-warning.png
+++ b/pixmaps/dialog-warning.png
diff --git a/hardinfo2/pixmaps/dns.png b/pixmaps/dns.png
index 44dbb3fb..44dbb3fb 100644
--- a/hardinfo2/pixmaps/dns.png
+++ b/pixmaps/dns.png
diff --git a/hardinfo2/pixmaps/environment.png b/pixmaps/environment.png
index 2f580752..2f580752 100644
--- a/hardinfo2/pixmaps/environment.png
+++ b/pixmaps/environment.png
diff --git a/hardinfo2/pixmaps/face-grin.png b/pixmaps/face-grin.png
index cc45e7cf..cc45e7cf 100644
--- a/hardinfo2/pixmaps/face-grin.png
+++ b/pixmaps/face-grin.png
diff --git a/hardinfo2/pixmaps/fft.png b/pixmaps/fft.png
index ed16da14..ed16da14 100644
--- a/hardinfo2/pixmaps/fft.png
+++ b/pixmaps/fft.png
diff --git a/hardinfo2/pixmaps/hdd.png b/pixmaps/hdd.png
index d0350343..d0350343 100644
--- a/hardinfo2/pixmaps/hdd.png
+++ b/pixmaps/hdd.png
diff --git a/hardinfo2/pixmaps/home.png b/pixmaps/home.png
index 74a83d04..74a83d04 100644
--- a/hardinfo2/pixmaps/home.png
+++ b/pixmaps/home.png
diff --git a/hardinfo2/pixmaps/inputdevices.png b/pixmaps/inputdevices.png
index aea0f1d7..aea0f1d7 100644
--- a/hardinfo2/pixmaps/inputdevices.png
+++ b/pixmaps/inputdevices.png
diff --git a/hardinfo2/pixmaps/internet.png b/pixmaps/internet.png
index ca76ef6c..ca76ef6c 100644
--- a/hardinfo2/pixmaps/internet.png
+++ b/pixmaps/internet.png
diff --git a/hardinfo2/pixmaps/joystick.png b/pixmaps/joystick.png
index 368b1793..368b1793 100644
--- a/hardinfo2/pixmaps/joystick.png
+++ b/pixmaps/joystick.png
diff --git a/hardinfo2/pixmaps/keyboard.png b/pixmaps/keyboard.png
index 9d0eecf6..9d0eecf6 100644
--- a/hardinfo2/pixmaps/keyboard.png
+++ b/pixmaps/keyboard.png
diff --git a/hardinfo2/pixmaps/language.png b/pixmaps/language.png
index 495a94bc..495a94bc 100644
--- a/hardinfo2/pixmaps/language.png
+++ b/pixmaps/language.png
diff --git a/hardinfo2/pixmaps/logo.png b/pixmaps/logo.png
index 9d0484a5..9d0484a5 100644
--- a/hardinfo2/pixmaps/logo.png
+++ b/pixmaps/logo.png
diff --git a/hardinfo2/pixmaps/logo.xcf b/pixmaps/logo.xcf
index e4295251..e4295251 100644
--- a/hardinfo2/pixmaps/logo.xcf
+++ b/pixmaps/logo.xcf
diff --git a/hardinfo2/pixmaps/memory.png b/pixmaps/memory.png
index 25ffba99..25ffba99 100644
--- a/hardinfo2/pixmaps/memory.png
+++ b/pixmaps/memory.png
diff --git a/hardinfo2/pixmaps/modem.png b/pixmaps/modem.png
index 450e4039..450e4039 100644
--- a/hardinfo2/pixmaps/modem.png
+++ b/pixmaps/modem.png
diff --git a/hardinfo2/pixmaps/module.png b/pixmaps/module.png
index 7c389a20..7c389a20 100644
--- a/hardinfo2/pixmaps/module.png
+++ b/pixmaps/module.png
diff --git a/hardinfo2/pixmaps/monitor.png b/pixmaps/monitor.png
index fbe38d64..fbe38d64 100644
--- a/hardinfo2/pixmaps/monitor.png
+++ b/pixmaps/monitor.png
diff --git a/hardinfo2/pixmaps/mouse.png b/pixmaps/mouse.png
index 8baa74dc..8baa74dc 100644
--- a/hardinfo2/pixmaps/mouse.png
+++ b/pixmaps/mouse.png
diff --git a/hardinfo2/pixmaps/nautilus.png b/pixmaps/nautilus.png
index 2eac9171..2eac9171 100644
--- a/hardinfo2/pixmaps/nautilus.png
+++ b/pixmaps/nautilus.png
diff --git a/hardinfo2/pixmaps/network-connections.png b/pixmaps/network-connections.png
index 0e9124a7..0e9124a7 100644
--- a/hardinfo2/pixmaps/network-connections.png
+++ b/pixmaps/network-connections.png
diff --git a/hardinfo2/pixmaps/network-interface.png b/pixmaps/network-interface.png
index 0a765eb4..0a765eb4 100644
--- a/hardinfo2/pixmaps/network-interface.png
+++ b/pixmaps/network-interface.png
diff --git a/hardinfo2/pixmaps/network-statistics.png b/pixmaps/network-statistics.png
index e9c6a8be..e9c6a8be 100644
--- a/hardinfo2/pixmaps/network-statistics.png
+++ b/pixmaps/network-statistics.png
diff --git a/hardinfo2/pixmaps/network.png b/pixmaps/network.png
index 5f95ba3e..5f95ba3e 100644
--- a/hardinfo2/pixmaps/network.png
+++ b/pixmaps/network.png
diff --git a/hardinfo2/pixmaps/nqueens.png b/pixmaps/nqueens.png
index e33e857d..e33e857d 100644
--- a/hardinfo2/pixmaps/nqueens.png
+++ b/pixmaps/nqueens.png
diff --git a/hardinfo2/pixmaps/os.png b/pixmaps/os.png
index 2c07199b..2c07199b 100644
--- a/hardinfo2/pixmaps/os.png
+++ b/pixmaps/os.png
diff --git a/hardinfo2/pixmaps/pcmcia.png b/pixmaps/pcmcia.png
index 2baac660..2baac660 100644
--- a/hardinfo2/pixmaps/pcmcia.png
+++ b/pixmaps/pcmcia.png
diff --git a/hardinfo2/pixmaps/printer.png b/pixmaps/printer.png
index 20861df9..20861df9 100644
--- a/hardinfo2/pixmaps/printer.png
+++ b/pixmaps/printer.png
diff --git a/hardinfo2/pixmaps/processor.png b/pixmaps/processor.png
index b5dfa01f..b5dfa01f 100644
--- a/hardinfo2/pixmaps/processor.png
+++ b/pixmaps/processor.png
diff --git a/hardinfo2/pixmaps/raytrace.png b/pixmaps/raytrace.png
index 9340a293..9340a293 100644
--- a/hardinfo2/pixmaps/raytrace.png
+++ b/pixmaps/raytrace.png
diff --git a/hardinfo2/pixmaps/report-large.png b/pixmaps/report-large.png
index d2dcafba..d2dcafba 100644
--- a/hardinfo2/pixmaps/report-large.png
+++ b/pixmaps/report-large.png
diff --git a/hardinfo2/pixmaps/report.png b/pixmaps/report.png
index 40d5fc8a..40d5fc8a 100644
--- a/hardinfo2/pixmaps/report.png
+++ b/pixmaps/report.png
diff --git a/hardinfo2/pixmaps/resources.png b/pixmaps/resources.png
index c23587bb..c23587bb 100644
--- a/hardinfo2/pixmaps/resources.png
+++ b/pixmaps/resources.png
diff --git a/hardinfo2/pixmaps/server-large.png b/pixmaps/server-large.png
index 98799715..98799715 100644
--- a/hardinfo2/pixmaps/server-large.png
+++ b/pixmaps/server-large.png
diff --git a/hardinfo2/pixmaps/server.png b/pixmaps/server.png
index 3f7b69b7..3f7b69b7 100644
--- a/hardinfo2/pixmaps/server.png
+++ b/pixmaps/server.png
diff --git a/hardinfo2/pixmaps/shares.png b/pixmaps/shares.png
index a05befe5..a05befe5 100644
--- a/hardinfo2/pixmaps/shares.png
+++ b/pixmaps/shares.png
diff --git a/hardinfo2/pixmaps/summary.png b/pixmaps/summary.png
index 8451f99e..8451f99e 100644
--- a/hardinfo2/pixmaps/summary.png
+++ b/pixmaps/summary.png
diff --git a/hardinfo2/pixmaps/syncmanager-small.png b/pixmaps/syncmanager-small.png
index 2a522619..2a522619 100644
--- a/hardinfo2/pixmaps/syncmanager-small.png
+++ b/pixmaps/syncmanager-small.png
diff --git a/hardinfo2/pixmaps/syncmanager.png b/pixmaps/syncmanager.png
index 46da6412..46da6412 100644
--- a/hardinfo2/pixmaps/syncmanager.png
+++ b/pixmaps/syncmanager.png
diff --git a/hardinfo2/pixmaps/therm.png b/pixmaps/therm.png
index 8db7a2cc..8db7a2cc 100644
--- a/hardinfo2/pixmaps/therm.png
+++ b/pixmaps/therm.png
diff --git a/hardinfo2/pixmaps/usb.png b/pixmaps/usb.png
index d35176a4..d35176a4 100644
--- a/hardinfo2/pixmaps/usb.png
+++ b/pixmaps/usb.png
diff --git a/hardinfo2/pixmaps/usbfldisk.png b/pixmaps/usbfldisk.png
index c6a2d0c6..c6a2d0c6 100644
--- a/hardinfo2/pixmaps/usbfldisk.png
+++ b/pixmaps/usbfldisk.png
diff --git a/hardinfo2/pixmaps/users.png b/pixmaps/users.png
index bf3cabb1..bf3cabb1 100644
--- a/hardinfo2/pixmaps/users.png
+++ b/pixmaps/users.png
diff --git a/hardinfo2/pixmaps/wireless.png b/pixmaps/wireless.png
index c5a5bf92..c5a5bf92 100644
--- a/hardinfo2/pixmaps/wireless.png
+++ b/pixmaps/wireless.png
diff --git a/hardinfo2/remote/remote.c b/remote/remote.c
index d266735d..d266735d 100644
--- a/hardinfo2/remote/remote.c
+++ b/remote/remote.c
diff --git a/hardinfo2/remote/ssh-conn.c b/remote/ssh-conn.c
index 7f099d35..7f099d35 100644
--- a/hardinfo2/remote/ssh-conn.c
+++ b/remote/ssh-conn.c
diff --git a/hardinfo2/remote/xmlrpc-client.c b/remote/xmlrpc-client.c
index d363729b..d363729b 100644
--- a/hardinfo2/remote/xmlrpc-client.c
+++ b/remote/xmlrpc-client.c
diff --git a/hardinfo2/remote/xmlrpc-server.c b/remote/xmlrpc-server.c
index e953cfd1..e953cfd1 100644
--- a/hardinfo2/remote/xmlrpc-server.c
+++ b/remote/xmlrpc-server.c
diff --git a/hardinfo2/shell/callbacks.c b/shell/callbacks.c
index 021560e2..021560e2 100644
--- a/hardinfo2/shell/callbacks.c
+++ b/shell/callbacks.c
diff --git a/hardinfo2/shell/iconcache.c b/shell/iconcache.c
index 74b19b0c..74b19b0c 100644
--- a/hardinfo2/shell/iconcache.c
+++ b/shell/iconcache.c
diff --git a/hardinfo2/shell/loadgraph.c b/shell/loadgraph.c
index c8503072..c8503072 100644
--- a/hardinfo2/shell/loadgraph.c
+++ b/shell/loadgraph.c
diff --git a/hardinfo2/shell/menu.c b/shell/menu.c
index 6b96e271..6b96e271 100644
--- a/hardinfo2/shell/menu.c
+++ b/shell/menu.c
diff --git a/hardinfo2/shell/report.c b/shell/report.c
index fb87ee23..fb87ee23 100644
--- a/hardinfo2/shell/report.c
+++ b/shell/report.c
diff --git a/hardinfo2/shell/shell.c b/shell/shell.c
index 1119c9cf..1119c9cf 100644
--- a/hardinfo2/shell/shell.c
+++ b/shell/shell.c
diff --git a/hardinfo2/shell/stock.c b/shell/stock.c
index ad1a0135..ad1a0135 100644
--- a/hardinfo2/shell/stock.c
+++ b/shell/stock.c
diff --git a/hardinfo2/shell/syncmanager.c b/shell/syncmanager.c
index 496dc348..496dc348 100644
--- a/hardinfo2/shell/syncmanager.c
+++ b/shell/syncmanager.c