Yes, hi-fi and home theatre are different. Make sure you know the difference. Although some home theatre systems do offer great hi-fi options.
If you are too confused, just start with a good speaker system (we call it front end) and then build your system around it.
I have been using Epos speakers for a long time, and recently they came out with even better speakers. My dream pair of (small) room bookshelf speakers would be the Harbeth or Spendor LS3/5A. I used to own a pair of Rogers LS3/5A, which I regrettably sold off (they are collectibles now). But if your space is larger, get larger systems. B+W and Monitor Audio, not too bad for 5+1 systems. I generally do not like US speakers (eg Bose, etc) - too bright and tiring on the ears. Brit speakers tend to be warmer and great for classical & vocals. French speakers also can be considered.
Anyway, the topic of hi-fi is too long and tedious to be discussing on a forum.