diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c674d12d..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,70 +0,0 @@
-/firmware/baseband/*.img
-/firmware/application/application.bin
-/CMakeCache.txt
-/Makefile
-/firmware/Makefile
-/firmware/baseband/Makefile
-/firmware/bootstrap/Makefile
-/firmware/application/Makefile
-/firmware/application/portapack_cpld_data.cpp
-/firmware/application/hackrf_cpld_data.cpp
-/firmware/application/hackrf_cpld_data.hpp
-/sdcard/ADSB/world_map.bin
-/sdcard/FREQMAN/BHT*
-/sdcard/FREQMAN/R.TXT
-/sdcard/FREQMAN/XXX.TXT
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.out
-*.app
-/firmware/baseband/*.bin
-
-# Other compiler/linker outputs
-*.make
-*.elf
-*.map
-*.lst
-.dep/
-build/
-CMakeFiles/
-
-# Debugging
-.gdbinit*
-
-# Editor files
-*.sublime-project
-*.sublime-workspace
-.vscode
-
-# Host OS leftovers
-.DS_Store
-/firmware/CMakeCache.txt
-
-# Python env
-env/
-
-# Other
-*.bak
diff --git a/sdcard/FREQMAN/NRK_RMF_STATIONS.TXT b/sdcard/FREQMAN/NRK_RMF_STATIONS.TXT
new file mode 100644
index 00000000..397d38d5
--- /dev/null
+++ b/sdcard/FREQMAN/NRK_RMF_STATIONS.TXT
@@ -0,0 +1,62 @@
+f=88200000,m=WFM,bw=200k,d=RMF Polkowice
+f=88200000,m=WFM,bw=200k,d=RMF Kielce
+f=89200000,m=WFM,bw=200k,d=RMF Bielsko-Biala
+f=89300000,m=WFM,bw=200k,d=RMF Lublin
+f=89300000,m=WFM,bw=200k,d=RMF Koszalin
+f=90600000,m=WFM,bw=200k,d=RMF Warsaw
+f=91000000,m=WFM,bw=200k,d=RMF Warsaw
+f=91300000,m=WFM,bw=200k,d=RMF Łobez
+f=91500000,m=WFM,bw=200k,d=RMF Ostroleka
+f=91700000,m=WFM,bw=200k,d=RMF Wagrowiec
+f=91900000,m=WFM,bw=200k,d=RMF Siedlce
+f=92500000,m=WFM,bw=200k,d=NRK Oslo
+f=92600000,m=WFM,bw=200k,d=RMF Elbląg
+f=92900000,m=WFM,bw=200k,d=RMF Wroclaw
+f=93000000,m=WFM,bw=200k,d=RMF Katowice
+f=93300000,m=WFM,bw=200k,d=RMF Bydgoszcz
+f=93500000,m=WFM,bw=200k,d=RMF Lodz
+f=93600000,m=WFM,bw=200k,d=RMF Ryki
+f=93800000,m=WFM,bw=200k,d=RMF Luban
+f=94300000,m=WFM,bw=200k,d=RMF Płock
+f=94600000,m=WFM,bw=200k,d=RMF Poznan
+f=94800000,m=WFM,bw=200k,d=NRK Bergen
+f=94800000,m=WFM,bw=200k,d=RMF Zagan
+f=95100000,m=WFM,bw=200k,d=RMF Suwałki
+f=95300000,m=WFM,bw=200k,d=RMF Olsztyn
+f=95400000,m=WFM,bw=200k,d=RMF Tarnow
+f=96000000,m=WFM,bw=200k,d=RMF Krakow
+f=96100000,m=WFM,bw=200k,d=RMF Legnica
+f=96100000,m=WFM,bw=200k,d=RMF Gorzow Wielkopolski
+f=96400000,m=WFM,bw=200k,d=RMF Bialogard
+f=96600000,m=WFM,bw=200k,d=RMF Walcz
+f=97100000,m=WFM,bw=200k,d=RMF Włoszczowa
+f=97200000,m=WFM,bw=200k,d=NRK Melhus
+f=98000000,m=WFM,bw=200k,d=RMF Kalisz
+f=98400000,m=WFM,bw=200k,d=RMF Gdansk
+f=98600000,m=WFM,bw=200k,d=NRK Arendal
+f=98900000,m=WFM,bw=200k,d=RMF Konin
+f=99300000,m=WFM,bw=200k,d=RMF Opole
+f=99500000,m=WFM,bw=200k,d=RMF Kluczbork
+f=100100000,m=WFM,bw=200k,d=RMF Rzeszow
+f=100200000,m=WFM,bw=200k,d=RMF Bialystok
+f=100800000,m=WFM,bw=200k,d=RMF Jelenia Gora
+f=100900000,m=WFM,bw=200k,d=RMF Slupsk
+f=101100000,m=WFM,bw=200k,d=RMF Solina
+f=101200000,m=WFM,bw=200k,d=RMF Swinoujscie
+f=101600000,m=WFM,bw=200k,d=RMF Klodzko
+f=101800000,m=WFM,bw=200k,d=RMF Zakopane
+f=101800000,m=WFM,bw=200k,d=RMF Leżajsk
+f=102000000,m=WFM,bw=200k,d=RMF Gizycko
+f=102900000,m=WFM,bw=200k,d=RMF Walbrzych
+f=103200000,m=WFM,bw=200k,d=RMF Szczawnica
+f=103400000,m=WFM,bw=200k,d=RMF Przemyśl
+f=103400000,m=WFM,bw=200k,d=RMF Lebork
+f=104700000,m=WFM,bw=200k,d=RMF Rabka
+f=104900000,m=WFM,bw=200k,d=RMF Koszalin
+f=105900000,m=WFM,bw=200k,d=RMF Krynica
+f=105900000,m=WFM,bw=200k,d=RMF Czestochowa
+f=106400000,m=WFM,bw=200k,d=RMF Zielona Gora
+f=106500000,m=WFM,bw=200k,d=RMF Elk
+f=106700000,m=WFM,bw=200k,d=RMF Szczecin
+f=107400000,m=WFM,bw=200k,d=RMF Iława
+f=107700000,m=WFM,bw=200k,d=RMF Zamosc
diff --git a/sdcard/FREQMAN/WATER_METERS.TXT b/sdcard/FREQMAN/WATER_METERS.TXT
new file mode 100644
index 00000000..adad3d9a
--- /dev/null
+++ b/sdcard/FREQMAN/WATER_METERS.TXT
@@ -0,0 +1,5 @@
+f=863000000,d=WaterMeter
+f=868000000,d=WaterMeter: ETW-ECO, Zenner
+f=868600000,d=WaterMeter: Ecomess
+f=868950000,d=WaterMeter: Apator/Santech/Techem
+f=874400000,d=WaterMeter
diff --git a/sdcard/LOOKINGGLASS/PRESETS.TXT b/sdcard/LOOKINGGLASS/PRESETS.TXT
index eafa054d..9015653d 100644
--- a/sdcard/LOOKINGGLASS/PRESETS.TXT
+++ b/sdcard/LOOKINGGLASS/PRESETS.TXT
@@ -1,18 +1,22 @@
-# INI,END,DESCRIPTION 
-# (Freq range in MHz, min separation 240MHz)
+# INI,END,DESCRIPTION
+# (Freq range in MHz, min separation 3MHz)
 # (Description up to 20 char)
 # (fields comma delimiter)
-260,500,315/433 MHz KEYFOBS
-2320,2560,BL / WIFI 2.4GHz
-5160,5900,WIFI 5GHz
-10,7250,FULL RANGE
 140,380,VHF MICS AND MARINE
+260,500,315/433 MHz KEYFOBS
 390,420,RADIOSONDES
 420,660,UHF MICS
-
-# https://www.fcc.gov/wireless/bureau-divisions/mobility-division/paging
-35,36,USA PAGERS 35
-43,44,USA PAGERS 44
-152,159,USA PAGERS 152
-454,460,USA PAGERS 454
-929,932,USA PAGERS 930
+# WATER METERS
+850,900,Water meters
+902,928,ISM 900MHz
+# PAGERS https://www.fcc.gov/wireless/bureau-divisions/mobility-division/paging
+34,36,USA PAGERS 35
+43,45,USA PAGERS 44
+151,153,USA PAGERS 152
+453,454,USA PAGERS 454
+929,931,USA PAGERS 930
+# WIFI
+2320,2560,BL / WIFI 2.4GHz
+5160,5900,WIFI 5GHz
+# FULL
+10,7250,FULL RANGE